Changeset 22
- Timestamp:
- 09/21/07 05:04:56 (1 year ago)
- Files:
-
- trunk/build/demo_config.php (added)
- trunk/build/install.php (modified) (7 diffs)
- trunk/src/includes/editam/models/user.php (modified) (1 diff)
- trunk/src/includes/editam/script/setup (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/build/install.php
r21 r22 71 71 'max' => 1, 72 72 'min' => 1, 73 'default' => 'My new Editam Site',74 73 'desc' => 'Site name.'), 75 74 … … 81 80 'max' => 1, 82 81 'min' => 1, 83 'default' => 'admin',84 82 'desc' => 'Administrator login.'), 85 83 … … 88 86 'max' => 1, 89 87 'min' => 1, 90 'default' => Ak::randomString(6),91 88 'desc' => 'Administrator password.'), 92 89 … … 104 101 'max' => 1, 105 102 'min' => 1, 106 'default' => 'localhost',107 103 'desc' => 'Database host.'), 108 104 … … 117 113 'max' => 1, 118 114 'min' => 1, 119 'default' => 'editam',120 115 'desc' => 'Database password.'), 121 116 … … 131 126 'max' => 1, 132 127 'min' => 1, 133 'default' => 'mysql',134 128 'desc' => 'Database type.'), 135 129 … … 145 139 'max' => 8, 146 140 'min' => 1, 147 'default' => 'en',148 141 'desc' => 'Locales.'), 149 142 trunk/src/includes/editam/models/user.php
r2 r22 55 55 $this->needsEmailValidation() ? $this->validatesFormatOf('email', AK_EMAIL_REGULAR_EXPRESSION, $this->t('Invalid email address')) : null; 56 56 $this->validatesLengthOf('login', array('in'=>array(3, 40), 'too_long' => $this->t('pick a shorter login'), 'too_short' => $this->t('pick a longer name'))); 57 $this->needsPasswordLengthValidation() ? $this->validatesLengthOf('password', array('in'=>array( 5, 40), 'too_long' => $this->t('pick a shorter password'), 'too_short' => $this->t('pick a longer password'))) : null;57 $this->needsPasswordLengthValidation() ? $this->validatesLengthOf('password', array('in'=>array(4, 40), 'too_long' => $this->t('pick a shorter password'), 'too_short' => $this->t('pick a longer password'))) : null; 58 58 } 59 59 trunk/src/includes/editam/script/setup
r21 r22 7 7 defined('AK_CONFIG_DIR') ? null : define('AK_CONFIG_DIR', AK_BASE_DIR.DS.'config'); 8 8 include_once(AK_CONFIG_DIR.DS.'boot.php'); 9 10 error_reporting(E_ALL ^ E_NOTICE); 9 11 10 12 require_once 'PHP/Compat.php'; … … 26 28 } 27 29 30 defined('AK_ACTION_CONTROLLER_AVAILABLE_HELPERS') ? null : define('AK_ACTION_CONTROLLER_AVAILABLE_HELPERS', 'url_helper,text_helper,tag_helper,scriptaculous_helper,prototype_helper,pagination_helper,number_helper,menu_helper,javascript_macros_helper,javascript_helper,form_tag_helper,form_options_helper,form_helper,file_upload_helper,date_helper,capture_helper,asset_tag_helper,active_record_helper,editags_helper,layout_helper'); 31 28 32 Ak::import('editam_setup'); 29 33 30 34 $EditamSetup =& new EditamSetup(); 31 35 $EditamSetup->url_suffix = @$setup_options['url_suffix']; 36 37 defined('AK_SITE_URL_SUFFIX') ? null : define('AK_SITE_URL_SUFFIX', $EditamSetup->url_suffix); 32 38 33 39 $EditamSetup->ftp_user = @$setup_options['ftp_user'];
