Changeset 2938
- Timestamp:
- 05/29/10 01:28:03 (21 months ago)
- Location:
- trunk
- Files:
-
- 6 added
- 1 deleted
- 9 edited
-
CHANGELOG (modified) (1 diff)
-
gui/admin/settings.php (modified) (8 diffs)
-
gui/include/IspCP (added)
-
gui/include/IspCP/Config.php (added)
-
gui/include/IspCP/ConfigHandler (added)
-
gui/include/IspCP/ConfigHandler.php (added)
-
gui/include/IspCP/ConfigHandler/Db.php (added)
-
gui/include/IspCP/ConfigHandler/File.php (added)
-
gui/include/admin-functions.php (modified) (1 diff)
-
gui/include/class.Config.php (deleted)
-
gui/include/class.Database.php (modified) (1 diff)
-
gui/include/class.DatabaseResult.php (modified) (1 prop)
-
gui/include/class.SystemInfo.php (modified) (2 props)
-
gui/include/class.versionUpdate.php (modified) (1 prop)
-
gui/include/ispcp-lib.php (modified) (10 diffs)
-
gui/include/reseller-functions.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/CHANGELOG
r2937 r2938 1 1 ispCP ω 1.0.6 ChangeLog 2 2 ~~~~~~~~~~~~~~~~~~~~~~~~~~ 3 4 2010-05-28 Laurent Declercq 5 - GUI: 6 * Added a method in Database class to be able to get a raw PDO instance 7 * Added IspCP_ConfigHandler class to handle config parameters from an 8 array 9 * Added IspCP_ConfigHandler adapter class to handle config parameter 10 from a database 11 * Changed admin/setting.php to use new IspCP_ConfigHandler interface 12 * Changed include/ispcp-lib.php to use new IspCP_ConfigHandler interface 13 * Fixed gen_def_language(): Initial language string should not be passed 14 by reference 15 * Improved autoloader funct. to be able to retrieve class files in the 16 new namespace 17 * Rewrited classes config parameters manipulation 18 * The `setConfig_Value()` funct. in admin-function.php is now deprecated 3 19 4 20 2010-05-26 Benedikt Heintel -
trunk/gui/admin/settings.php
r2880 r2938 34 34 35 35 $tpl = new pTemplate(); 36 $tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH'). '/settings.tpl');36 $tpl->define_dynamic('page', $main_cfg->ADMIN_TEMPLATE_PATH . '/settings.tpl'); 37 37 $tpl->define_dynamic('def_language', 'page'); 38 39 $theme_color = Config::getInstance()->get('USER_INITIAL_THEME');40 38 41 39 $tpl->assign( 42 40 array( 43 41 'TR_ADMIN_SETTINGS_PAGE_TITLE' => tr('ispCP - Admin/Settings'), 44 'THEME_COLOR_PATH' => "../themes/ $theme_color",42 'THEME_COLOR_PATH' => "../themes/{$main_cfg->USER_INITIAL_THEME}", 45 43 'THEME_CHARSET' => tr('encoding'), 46 44 'ISP_LOGO' => get_logo($_SESSION['user_id']) … … 49 47 50 48 if (isset($_POST['uaction']) && $_POST['uaction'] == 'apply') { 51 $lostpassword = $_POST['lostpassword']; 52 $lostpassword_timeout = clean_input($_POST['lostpassword_timeout']); 53 $passwd_chars = clean_input($_POST['passwd_chars']); 54 $passwd_strong = $_POST['passwd_strong']; 55 $bruteforce = $_POST['bruteforce']; 56 $bruteforce_between = $_POST['bruteforce_between']; 57 $bruteforce_max_login = clean_input($_POST['bruteforce_max_login']); 58 $bruteforce_block_time = clean_input($_POST['bruteforce_block_time']); 59 $bruteforce_between_time = clean_input($_POST['bruteforce_between_time']); 60 $bruteforce_max_capcha = clean_input($_POST['bruteforce_max_capcha']); 61 $create_default_email_addresses = $_POST['create_default_email_addresses']; 62 $count_default_email_addresses = $_POST['count_default_email_addresses']; 63 $hard_mail_suspension = $_POST['hard_mail_suspension']; 64 $user_initial_lang = $_POST['def_language']; 65 $support_system = $_POST['support_system']; 66 $hosting_plan_level = $_POST['hosting_plan_level']; 67 $domain_rows_per_page = clean_input($_POST['domain_rows_per_page']); 68 $checkforupdate = $_POST['checkforupdate']; 69 $show_compression_size = $_POST['show_compression_size']; 70 $prevent_external_login_admin = $_POST['prevent_external_login_admin']; 71 $prevent_external_login_reseller= $_POST['prevent_external_login_reseller']; 72 $prevent_external_login_client = $_POST['prevent_external_login_client']; 73 $custom_orderpanel_id = clean_input($_POST['coid']); 74 $tld_strict_validation = $_POST['tld_strict_validation']; 75 $sld_strict_validation = $_POST['sld_strict_validation']; 76 $max_dnames_labels = clean_input($_POST['max_dnames_labels']); 77 $max_subdnames_labels = clean_input($_POST['max_subdnames_labels']); 78 79 // change Loglevel to constant: 80 switch ($_POST['log_level']) { 81 case "E_USER_NOTICE": 82 $log_level = E_USER_NOTICE; 83 break; 84 case "E_USER_WARNING": 85 $log_level = E_USER_WARNING; 86 break; 87 case "E_USER_ERROR": 88 $log_level = E_USER_ERROR; 89 break; 90 default: 91 $log_level = E_USER_OFF; 92 } // end switch 93 94 if ((!is_number($lostpassword_timeout)) 95 || (!is_number($passwd_chars)) 49 50 $lostpwd = $_POST['lostpassword']; 51 $lostpwd_timeout = clean_input($_POST['lostpassword_timeout']); 52 $pwd_chars = clean_input($_POST['passwd_chars']); 53 $pwd_strong = $_POST['passwd_strong']; 54 $bruteforce = $_POST['bruteforce']; 55 $bruteforce_between = $_POST['bruteforce_between']; 56 $bruteforce_max_login = clean_input($_POST['bruteforce_max_login']); 57 $bruteforce_block_time = clean_input($_POST['bruteforce_block_time']); 58 $bruteforce_between_time = clean_input($_POST['bruteforce_between_time']); 59 $bruteforce_max_capcha = clean_input($_POST['bruteforce_max_capcha']); 60 $create_default_emails = $_POST['create_default_email_addresses']; 61 $count_default_emails = $_POST['count_default_email_addresses']; 62 $hard_mail_suspension = $_POST['hard_mail_suspension']; 63 $user_initial_lang = $_POST['def_language']; 64 $support_system = $_POST['support_system']; 65 $hosting_plan_level = $_POST['hosting_plan_level']; 66 $domain_rows_per_page = clean_input($_POST['domain_rows_per_page']); 67 $checkforupdate = $_POST['checkforupdate']; 68 $show_compression_size = $_POST['show_compression_size']; 69 $prev_ext_login_admin = $_POST['prevent_external_login_admin']; 70 $prev_ext_login_reseller = $_POST['prevent_external_login_reseller']; 71 $prev_ext_login_client = $_POST['prevent_external_login_client']; 72 $custom_orderpanel_id = clean_input($_POST['coid']); 73 $tld_strict_validation = $_POST['tld_strict_validation']; 74 $sld_strict_validation = $_POST['sld_strict_validation']; 75 $max_dnames_labels = clean_input($_POST['max_dnames_labels']); 76 $max_subdnames_labels = clean_input($_POST['max_subdnames_labels']); 77 $log_level = constant($_POST['log_level']); 78 79 if ((!is_number($lostpwd_timeout)) 80 || (!is_number($pwd_chars)) 96 81 || (!is_number($bruteforce_max_login)) 97 82 || (!is_number($bruteforce_block_time)) … … 109 94 $max_subdnames_labels = 1; 110 95 } else { 111 setConfig_Value('LOSTPASSWORD', $lostpassword); 112 setConfig_Value('LOSTPASSWORD_TIMEOUT', $lostpassword_timeout); 113 setConfig_Value('PASSWD_CHARS', $passwd_chars); 114 setConfig_Value('PASSWD_STRONG', $passwd_strong); 115 setConfig_Value('BRUTEFORCE', $bruteforce); 116 setConfig_Value('BRUTEFORCE_BETWEEN', $bruteforce_between); 117 setConfig_Value('BRUTEFORCE_MAX_LOGIN', $bruteforce_max_login); 118 setConfig_Value('BRUTEFORCE_BLOCK_TIME', $bruteforce_block_time); 119 setConfig_Value('BRUTEFORCE_BETWEEN_TIME', $bruteforce_between_time); 120 setConfig_Value('BRUTEFORCE_MAX_CAPTCHA', $bruteforce_max_capcha); 121 setConfig_Value('CREATE_DEFAULT_EMAIL_ADDRESSES', $create_default_email_addresses); 122 setConfig_Value('COUNT_DEFAULT_EMAIL_ADDRESSES', $count_default_email_addresses); 123 setConfig_Value('HARD_MAIL_SUSPENSION', $hard_mail_suspension); 124 setConfig_Value('USER_INITIAL_LANG', $user_initial_lang); 125 setConfig_Value('ISPCP_SUPPORT_SYSTEM', $support_system); 126 setConfig_Value('HOSTING_PLANS_LEVEL', $hosting_plan_level); 127 setConfig_Value('DOMAIN_ROWS_PER_PAGE', $domain_rows_per_page); 128 setConfig_Value('LOG_LEVEL', $log_level); 129 setConfig_Value('CHECK_FOR_UPDATES', $checkforupdate); 130 setConfig_Value('SHOW_COMPRESSION_SIZE', $show_compression_size); 131 setConfig_Value('PREVENT_EXTERNAL_LOGIN_ADMIN', $prevent_external_login_admin); 132 setConfig_Value('PREVENT_EXTERNAL_LOGIN_RESELLER', $prevent_external_login_reseller); 133 setConfig_Value('PREVENT_EXTERNAL_LOGIN_CLIENT', $prevent_external_login_client); 134 setConfig_Value('CUSTOM_ORDERPANEL_ID', $custom_orderpanel_id); 135 setConfig_Value('TLD_STRICT_VALIDATION', $tld_strict_validation); 136 setConfig_Value('SLD_STRICT_VALIDATION', $sld_strict_validation); 137 setConfig_Value('MAX_DNAMES_LABELS', $max_dnames_labels); 138 setConfig_Value('MAX_SUBDNAMES_LABELS', $max_subdnames_labels); 139 set_page_message(tr('Settings saved !')); 96 $db_cfg =& Config::getInstance(Config::DB); 97 98 $db_cfg->LOSTPASSWORD = $lostpwd; 99 $db_cfg->LOSTPASSWORD_TIMEOUT = $lostpwd_timeout; 100 $db_cfg->PASSWD_CHARS = $pwd_chars; 101 $db_cfg->PASSWD_STRONG = $pwd_strong; 102 $db_cfg->BRUTEFORCE = $bruteforce; 103 $db_cfg->BRUTEFORCE_BETWEEN = $bruteforce_between; 104 $db_cfg->BRUTEFORCE_MAX_LOGIN = $bruteforce_max_login; 105 $db_cfg->BRUTEFORCE_BLOCK_TIME = $bruteforce_block_time; 106 $db_cfg->BRUTEFORCE_BETWEEN_TIME = $bruteforce_between_time; 107 $db_cfg->BRUTEFORCE_MAX_CAPTCHA = $bruteforce_max_capcha; 108 $db_cfg->CREATE_DEFAULT_EMAIL_ADDRESSES = $create_default_emails; 109 $db_cfg->COUNT_DEFAULT_EMAIL_ADDRESSES = $count_default_emails; 110 $db_cfg->HARD_MAIL_SUSPENSION = $hard_mail_suspension; 111 $db_cfg->USER_INITIAL_LANG = $user_initial_lang; 112 $db_cfg->ISPCP_SUPPORT_SYSTEM = $support_system; 113 $db_cfg->HOSTING_PLANS_LEVEL = $hosting_plan_level; 114 $db_cfg->DOMAIN_ROWS_PER_PAGE = $domain_rows_per_page; 115 $db_cfg->LOG_LEVEL = $log_level; 116 $db_cfg->CHECK_FOR_UPDATES = $checkforupdate; 117 $db_cfg->SHOW_COMPRESSION_SIZE = $show_compression_size; 118 $db_cfg->PREVENT_EXTERNAL_LOGIN_ADMIN = $prev_ext_login_admin; 119 $db_cfg->PREVENT_EXTERNAL_LOGIN_RESELLER = $prev_ext_login_reseller; 120 $db_cfg->PREVENT_EXTERNAL_LOGIN_CLIENT = $prev_ext_login_client; 121 $db_cfg->CUSTOM_ORDERPANEL_ID = $custom_orderpanel_id; 122 $db_cfg->TLD_STRICT_VALIDATION = $tld_strict_validation; 123 $db_cfg->SLD_STRICT_VALIDATION = $sld_strict_validation; 124 $db_cfg->MAX_DNAMES_LABELS = $max_dnames_labels; 125 $db_cfg->MAX_SUBDNAMES_LABELS = $max_subdnames_labels; 126 127 $main_cfg->replace_with($db_cfg); 128 129 set_page_message(tr('Settings saved!')); 140 130 } 141 131 } 142 132 143 $coid = Config::getInstance()->exists('CUSTOM_ORDERPANEL_ID') ? Config::getInstance()->get('CUSTOM_ORDERPANEL_ID'): ''; 133 $coid = isset($main_cfg->CUSTOM_ORDERPANEL_ID) 134 ? $main_cfg->CUSTOM_ORDERPANEL_ID 135 : ''; 144 136 145 137 $tpl->assign( 146 138 array( 147 'LOSTPASSWORD_TIMEOUT_VALUE' => Config::getInstance()->get('LOSTPASSWORD_TIMEOUT'),148 'PASSWD_CHARS' => Config::getInstance()->get('PASSWD_CHARS'),149 'BRUTEFORCE_MAX_LOGIN_VALUE' => Config::getInstance()->get('BRUTEFORCE_MAX_LOGIN'),150 'BRUTEFORCE_BLOCK_TIME_VALUE' => Config::getInstance()->get('BRUTEFORCE_BLOCK_TIME'),151 'BRUTEFORCE_BETWEEN_TIME_VALUE' => Config::getInstance()->get('BRUTEFORCE_BETWEEN_TIME'),152 'BRUTEFORCE_MAX_CAPTCHA' => Config::getInstance()->get('BRUTEFORCE_MAX_CAPTCHA'),153 'DOMAIN_ROWS_PER_PAGE' => Config::getInstance()->get('DOMAIN_ROWS_PER_PAGE'),139 'LOSTPASSWORD_TIMEOUT_VALUE' => $main_cfg->LOSTPASSWORD_TIMEOUT, 140 'PASSWD_CHARS' => $main_cfg->PASSWD_CHARS, 141 'BRUTEFORCE_MAX_LOGIN_VALUE' => $main_cfg->BRUTEFORCE_MAX_LOGIN, 142 'BRUTEFORCE_BLOCK_TIME_VALUE' => $main_cfg->BRUTEFORCE_BLOCK_TIME, 143 'BRUTEFORCE_BETWEEN_TIME_VALUE' => $main_cfg->BRUTEFORCE_BETWEEN_TIME, 144 'BRUTEFORCE_MAX_CAPTCHA' => $main_cfg->BRUTEFORCE_MAX_CAPTCHA, 145 'DOMAIN_ROWS_PER_PAGE' => $main_cfg->DOMAIN_ROWS_PER_PAGE, 154 146 'CUSTOM_ORDERPANEL_ID' => $coid, 155 'MAX_DNAMES_LABELS_VALUE' => Config::getInstance()->get('MAX_DNAMES_LABELS'),156 'MAX_SUBDNAMES_LABELS_VALUE' => Config::getInstance()->get('MAX_SUBDNAMES_LABELS')147 'MAX_DNAMES_LABELS_VALUE' => $main_cfg->MAX_DNAMES_LABELS, 148 'MAX_SUBDNAMES_LABELS_VALUE' => $main_cfg->MAX_SUBDNAMES_LABELS 157 149 ) 158 150 ); 159 151 160 $language = Config::getInstance()->get('USER_INITIAL_LANG'); 161 gen_def_language($tpl, $sql, $language); 162 163 if (Config::getInstance()->get('LOSTPASSWORD')) { 164 $tpl->assign('LOSTPASSWORD_SELECTED_ON', Config::getInstance()->get('HTML_SELECTED')); 152 //$language = $cfg['USER_INITIAL_LANG']; 153 gen_def_language($tpl, $sql, $main_cfg['USER_INITIAL_LANG']); 154 155 // Grab the value only once to improve performances 156 $html_selected = $main_cfg['HTML_SELECTED']; 157 158 if ($main_cfg->LOSTPASSWORD) { 159 $tpl->assign('LOSTPASSWORD_SELECTED_ON', $html_selected); 165 160 $tpl->assign('LOSTPASSWORD_SELECTED_OFF', ''); 166 161 } else { 167 162 $tpl->assign('LOSTPASSWORD_SELECTED_ON', ''); 168 $tpl->assign('LOSTPASSWORD_SELECTED_OFF', Config::getInstance()->get('HTML_SELECTED'));169 } 170 171 if ( Config::getInstance()->get('PASSWD_STRONG')) {172 $tpl->assign('PASSWD_STRONG_ON', Config::getInstance()->get('HTML_SELECTED'));163 $tpl->assign('LOSTPASSWORD_SELECTED_OFF', $html_selected); 164 } 165 166 if ($main_cfg->PASSWD_STRONG) { 167 $tpl->assign('PASSWD_STRONG_ON', $html_selected); 173 168 $tpl->assign('PASSWD_STRONG_OFF', ''); 174 169 } else { 175 170 $tpl->assign('PASSWD_STRONG_ON', ''); 176 $tpl->assign('PASSWD_STRONG_OFF', Config::getInstance()->get('HTML_SELECTED'));177 } 178 179 if ( Config::getInstance()->get('BRUTEFORCE')) {180 $tpl->assign('BRUTEFORCE_SELECTED_ON', Config::getInstance()->get('HTML_SELECTED'));171 $tpl->assign('PASSWD_STRONG_OFF', $html_selected); 172 } 173 174 if ($main_cfg->BRUTEFORCE) { 175 $tpl->assign('BRUTEFORCE_SELECTED_ON', $html_selected); 181 176 $tpl->assign('BRUTEFORCE_SELECTED_OFF', ''); 182 177 } else { 183 178 $tpl->assign('BRUTEFORCE_SELECTED_ON', ''); 184 $tpl->assign('BRUTEFORCE_SELECTED_OFF', Config::getInstance()->get('HTML_SELECTED'));185 } 186 187 if ( Config::getInstance()->get('BRUTEFORCE_BETWEEN')) {188 $tpl->assign('BRUTEFORCE_BETWEEN_SELECTED_ON', Config::getInstance()->get('HTML_SELECTED'));179 $tpl->assign('BRUTEFORCE_SELECTED_OFF', $html_selected); 180 } 181 182 if ($main_cfg->BRUTEFORCE_BETWEEN) { 183 $tpl->assign('BRUTEFORCE_BETWEEN_SELECTED_ON', $html_selected); 189 184 $tpl->assign('BRUTEFORCE_BETWEEN_SELECTED_OFF', ''); 190 185 } else { 191 186 $tpl->assign('BRUTEFORCE_BETWEEN_SELECTED_ON', ''); 192 $tpl->assign('BRUTEFORCE_BETWEEN_SELECTED_OFF', Config::getInstance()->get('HTML_SELECTED'));193 } 194 195 if ( Config::getInstance()->get('ISPCP_SUPPORT_SYSTEM')) {196 $tpl->assign('SUPPORT_SYSTEM_SELECTED_ON', Config::getInstance()->get('HTML_SELECTED'));187 $tpl->assign('BRUTEFORCE_BETWEEN_SELECTED_OFF', $html_selected); 188 } 189 190 if ($main_cfg->ISPCP_SUPPORT_SYSTEM) { 191 $tpl->assign('SUPPORT_SYSTEM_SELECTED_ON', $html_selected); 197 192 $tpl->assign('SUPPORT_SYSTEM_SELECTED_OFF', ''); 198 193 } else { 199 194 $tpl->assign('SUPPORT_SYSTEM_SELECTED_ON', ''); 200 $tpl->assign('SUPPORT_SYSTEM_SELECTED_OFF', Config::getInstance()->get('HTML_SELECTED'));201 } 202 203 if ( Config::getInstance()->get('TLD_STRICT_VALIDATION')) {204 $tpl->assign('TLD_STRICT_VALIDATION_ON', Config::getInstance()->get('HTML_SELECTED'));195 $tpl->assign('SUPPORT_SYSTEM_SELECTED_OFF', $html_selected); 196 } 197 198 if ($main_cfg->TLD_STRICT_VALIDATION) { 199 $tpl->assign('TLD_STRICT_VALIDATION_ON', $html_selected); 205 200 $tpl->assign('TLD_STRICT_VALIDATION_OFF', ''); 206 201 } else { 207 202 $tpl->assign('TLD_STRICT_VALIDATION_ON', ''); 208 $tpl->assign('TLD_STRICT_VALIDATION_OFF', Config::getInstance()->get('HTML_SELECTED'));209 } 210 211 if ( Config::getInstance()->get('SLD_STRICT_VALIDATION')) {212 $tpl->assign('SLD_STRICT_VALIDATION_ON', Config::getInstance()->get('HTML_SELECTED'));203 $tpl->assign('TLD_STRICT_VALIDATION_OFF', $html_selected); 204 } 205 206 if ($main_cfg->SLD_STRICT_VALIDATION) { 207 $tpl->assign('SLD_STRICT_VALIDATION_ON', $html_selected); 213 208 $tpl->assign('SLD_STRICT_VALIDATION_OFF', ''); 214 209 } else { 215 210 $tpl->assign('SLD_STRICT_VALIDATION_ON', ''); 216 $tpl->assign('SLD_STRICT_VALIDATION_OFF', Config::getInstance()->get('HTML_SELECTED'));217 } 218 219 if ( Config::getInstance()->get('CREATE_DEFAULT_EMAIL_ADDRESSES')) {220 $tpl->assign('CREATE_DEFAULT_EMAIL_ADDRESSES_ON', Config::getInstance()->get('HTML_SELECTED'));211 $tpl->assign('SLD_STRICT_VALIDATION_OFF', $html_selected); 212 } 213 214 if ($main_cfg->CREATE_DEFAULT_EMAIL_ADDRESSES) { 215 $tpl->assign('CREATE_DEFAULT_EMAIL_ADDRESSES_ON', $html_selected); 221 216 $tpl->assign('CREATE_DEFAULT_EMAIL_ADDRESSES_OFF', ''); 222 217 } else { 223 218 $tpl->assign('CREATE_DEFAULT_EMAIL_ADDRESSES_ON', ''); 224 $tpl->assign('CREATE_DEFAULT_EMAIL_ADDRESSES_OFF', Config::getInstance()->get('HTML_SELECTED'));225 } 226 227 if ( Config::getInstance()->get('COUNT_DEFAULT_EMAIL_ADDRESSES')) {228 $tpl->assign('COUNT_DEFAULT_EMAIL_ADDRESSES_ON', Config::getInstance()->get('HTML_SELECTED'));219 $tpl->assign('CREATE_DEFAULT_EMAIL_ADDRESSES_OFF', $html_selected); 220 } 221 222 if ($main_cfg->COUNT_DEFAULT_EMAIL_ADDRESSES) { 223 $tpl->assign('COUNT_DEFAULT_EMAIL_ADDRESSES_ON', $html_selected); 229 224 $tpl->assign('COUNT_DEFAULT_EMAIL_ADDRESSES_OFF', ''); 230 225 } else { 231 226 $tpl->assign('COUNT_DEFAULT_EMAIL_ADDRESSES_ON', ''); 232 $tpl->assign('COUNT_DEFAULT_EMAIL_ADDRESSES_OFF', Config::getInstance()->get('HTML_SELECTED'));233 } 234 235 if ( Config::getInstance()->get('HARD_MAIL_SUSPENSION')) {236 $tpl->assign('HARD_MAIL_SUSPENSION_ON', Config::getInstance()->get('HTML_SELECTED'));227 $tpl->assign('COUNT_DEFAULT_EMAIL_ADDRESSES_OFF', $html_selected); 228 } 229 230 if ($main_cfg->HARD_MAIL_SUSPENSION) { 231 $tpl->assign('HARD_MAIL_SUSPENSION_ON', $html_selected); 237 232 $tpl->assign('HARD_MAIL_SUSPENSION_OFF', ''); 238 233 } else { 239 234 $tpl->assign('HARD_MAIL_SUSPENSION_ON', ''); 240 $tpl->assign('HARD_MAIL_SUSPENSION_OFF', Config::getInstance()->get('HTML_SELECTED'));241 } 242 243 if ( Config::getInstance()->get('HOSTING_PLANS_LEVEL') == "admin") {244 $tpl->assign('HOSTING_PLANS_LEVEL_ADMIN', Config::getInstance()->get('HTML_SELECTED'));235 $tpl->assign('HARD_MAIL_SUSPENSION_OFF', $html_selected); 236 } 237 238 if ($main_cfg->HOSTING_PLANS_LEVEL == 'admin') { 239 $tpl->assign('HOSTING_PLANS_LEVEL_ADMIN', $html_selected); 245 240 $tpl->assign('HOSTING_PLANS_LEVEL_RESELLER', ''); 246 241 } else { 247 242 $tpl->assign('HOSTING_PLANS_LEVEL_ADMIN', ''); 248 $tpl->assign('HOSTING_PLANS_LEVEL_RESELLER', Config::getInstance()->get('HTML_SELECTED'));249 } 250 251 if ( Config::getInstance()->get('CHECK_FOR_UPDATES')) {252 $tpl->assign('CHECK_FOR_UPDATES_SELECTED_ON', Config::getInstance()->get('HTML_SELECTED'));243 $tpl->assign('HOSTING_PLANS_LEVEL_RESELLER', $html_selected); 244 } 245 246 if ($main_cfg->CHECK_FOR_UPDATES) { 247 $tpl->assign('CHECK_FOR_UPDATES_SELECTED_ON', $html_selected); 253 248 $tpl->assign('CHECK_FOR_UPDATES_SELECTED_OFF', ''); 254 249 } else { 255 250 $tpl->assign('CHECK_FOR_UPDATES_SELECTED_ON', ''); 256 $tpl->assign('CHECK_FOR_UPDATES_SELECTED_OFF', Config::getInstance()->get('HTML_SELECTED'));257 } 258 259 if ( Config::getInstance()->get('SHOW_COMPRESSION_SIZE')) {260 $tpl->assign('SHOW_COMPRESSION_SIZE_SELECTED_ON', Config::getInstance()->get('HTML_SELECTED'));251 $tpl->assign('CHECK_FOR_UPDATES_SELECTED_OFF', $html_selected); 252 } 253 254 if ($main_cfg->SHOW_COMPRESSION_SIZE) { 255 $tpl->assign('SHOW_COMPRESSION_SIZE_SELECTED_ON', $html_selected); 261 256 $tpl->assign('SHOW_COMPRESSION_SIZE_SELECTED_OFF', ''); 262 257 } else { 263 258 $tpl->assign('SHOW_COMPRESSION_SIZE_SELECTED_ON', ''); 264 $tpl->assign('SHOW_COMPRESSION_SIZE_SELECTED_OFF', Config::getInstance()->get('HTML_SELECTED'));265 } 266 267 if ( Config::getInstance()->get('PREVENT_EXTERNAL_LOGIN_ADMIN')) {268 $tpl->assign('PREVENT_EXTERNAL_LOGIN_ADMIN_SELECTED_ON', Config::getInstance()->get('HTML_SELECTED'));259 $tpl->assign('SHOW_COMPRESSION_SIZE_SELECTED_OFF', $html_selected); 260 } 261 262 if ($main_cfg->PREVENT_EXTERNAL_LOGIN_ADMIN) { 263 $tpl->assign('PREVENT_EXTERNAL_LOGIN_ADMIN_SELECTED_ON', $html_selected); 269 264 $tpl->assign('PREVENT_EXTERNAL_LOGIN_ADMIN_SELECTED_OFF', ''); 270 265 } else { 271 266 $tpl->assign('PREVENT_EXTERNAL_LOGIN_ADMIN_SELECTED_ON', ''); 272 $tpl->assign('PREVENT_EXTERNAL_LOGIN_ADMIN_SELECTED_OFF', Config::getInstance()->get('HTML_SELECTED'));273 } 274 275 if ( Config::getInstance()->get('PREVENT_EXTERNAL_LOGIN_RESELLER')) {276 $tpl->assign('PREVENT_EXTERNAL_LOGIN_RESELLER_SELECTED_ON', Config::getInstance()->get('HTML_SELECTED'));267 $tpl->assign('PREVENT_EXTERNAL_LOGIN_ADMIN_SELECTED_OFF', $html_selected); 268 } 269 270 if ($main_cfg->PREVENT_EXTERNAL_LOGIN_RESELLER) { 271 $tpl->assign('PREVENT_EXTERNAL_LOGIN_RESELLER_SELECTED_ON', $html_selected); 277 272 $tpl->assign('PREVENT_EXTERNAL_LOGIN_RESELLER_SELECTED_OFF', ''); 278 273 } else { 279 274 $tpl->assign('PREVENT_EXTERNAL_LOGIN_RESELLER_SELECTED_ON', ''); 280 $tpl->assign('PREVENT_EXTERNAL_LOGIN_RESELLER_SELECTED_OFF', Config::getInstance()->get('HTML_SELECTED'));281 } 282 283 if ( Config::getInstance()->get('PREVENT_EXTERNAL_LOGIN_CLIENT')) {284 $tpl->assign('PREVENT_EXTERNAL_LOGIN_CLIENT_SELECTED_ON', Config::getInstance()->get('HTML_SELECTED'));275 $tpl->assign('PREVENT_EXTERNAL_LOGIN_RESELLER_SELECTED_OFF', $html_selected); 276 } 277 278 if ($main_cfg->PREVENT_EXTERNAL_LOGIN_CLIENT) { 279 $tpl->assign('PREVENT_EXTERNAL_LOGIN_CLIENT_SELECTED_ON', $html_selected); 285 280 $tpl->assign('PREVENT_EXTERNAL_LOGIN_CLIENT_SELECTED_OFF', ''); 286 281 } else { 287 282 $tpl->assign('PREVENT_EXTERNAL_LOGIN_CLIENT_SELECTED_ON', ''); 288 $tpl->assign('PREVENT_EXTERNAL_LOGIN_CLIENT_SELECTED_OFF', Config::getInstance()->get('HTML_SELECTED'));289 } 290 291 switch ( Config::getInstance()->get('LOG_LEVEL')) {283 $tpl->assign('PREVENT_EXTERNAL_LOGIN_CLIENT_SELECTED_OFF', $html_selected); 284 } 285 286 switch ($main_cfg->LOG_LEVEL) { 292 287 case E_USER_OFF: 293 $tpl->assign('LOG_LEVEL_SELECTED_OFF', Config::getInstance()->get('HTML_SELECTED'));288 $tpl->assign('LOG_LEVEL_SELECTED_OFF', $html_selected); 294 289 $tpl->assign('LOG_LEVEL_SELECTED_NOTICE', ''); 295 290 $tpl->assign('LOG_LEVEL_SELECTED_WARNING', ''); … … 298 293 case E_USER_NOTICE: 299 294 $tpl->assign('LOG_LEVEL_SELECTED_OFF', ''); 300 $tpl->assign('LOG_LEVEL_SELECTED_NOTICE', Config::getInstance()->get('HTML_SELECTED'));295 $tpl->assign('LOG_LEVEL_SELECTED_NOTICE', $html_selected); 301 296 $tpl->assign('LOG_LEVEL_SELECTED_WARNING', ''); 302 297 $tpl->assign('LOG_LEVEL_SELECTED_ERROR', ''); … … 305 300 $tpl->assign('LOG_LEVEL_SELECTED_OFF', ''); 306 301 $tpl->assign('LOG_LEVEL_SELECTED_NOTICE', ''); 307 $tpl->assign('LOG_LEVEL_SELECTED_WARNING', Config::getInstance()->get('HTML_SELECTED'));302 $tpl->assign('LOG_LEVEL_SELECTED_WARNING', $html_selected); 308 303 $tpl->assign('LOG_LEVEL_SELECTED_ERROR', ''); 309 304 break; … … 312 307 $tpl->assign('LOG_LEVEL_SELECTED_NOTICE', ''); 313 308 $tpl->assign('LOG_LEVEL_SELECTED_WARNING', ''); 314 $tpl->assign('LOG_LEVEL_SELECTED_ERROR', Config::getInstance()->get('HTML_SELECTED'));309 $tpl->assign('LOG_LEVEL_SELECTED_ERROR', $html_selected); 315 310 } // end switch 316 311 … … 320 315 * 321 316 */ 322 gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH'). '/main_menu_settings.tpl');323 gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH'). '/menu_settings.tpl');317 gen_admin_mainmenu($tpl, $main_cfg->ADMIN_TEMPLATE_PATH . '/main_menu_settings.tpl'); 318 gen_admin_menu($tpl, $main_cfg->ADMIN_TEMPLATE_PATH . '/menu_settings.tpl'); 324 319 325 320 $tpl->assign( 326 321 array( 327 'TR_GENERAL_SETTINGS' => tr('General settings'), 328 'TR_SETTINGS' => tr('Settings'), 329 'TR_MESSAGE' => tr('Message'), 330 'TR_LOSTPASSWORD' => tr('Lost password'), 331 'TR_LOSTPASSWORD_TIMEOUT' => tr('Activation link expire time (minutes)'), 332 'TR_PASSWORD_SETTINGS' => tr('Password settings'), 333 'TR_PASSWD_STRONG' => tr('Use strong Passwords'), 334 'TR_PASSWD_CHARS' => tr('Password length'), 335 'TR_BRUTEFORCE' => tr('Bruteforce detection'), 336 'TR_BRUTEFORCE_BETWEEN' => tr('Block time between logins'), 337 'TR_BRUTEFORCE_MAX_LOGIN' => tr('Max number of login attempts'), 338 'TR_BRUTEFORCE_BLOCK_TIME' => tr('Blocktime (minutes)'), 339 'TR_BRUTEFORCE_BETWEEN_TIME' => tr('Block time between logins (seconds)'), 340 'TR_BRUTEFORCE_MAX_CAPTCHA' => tr('Max number of CAPTCHA validation attempts'), 341 'TR_OTHER_SETTINGS' => tr('Other settings'), 342 'TR_MAIL_SETTINGS' => tr('E-Mail settings'), 343 'TR_CREATE_DEFAULT_EMAIL_ADDRESSES' => tr('Create default E-Mail addresses'), 344 'TR_COUNT_DEFAULT_EMAIL_ADDRESSES' => tr('Count default E-Mail addresses'), 345 'TR_HARD_MAIL_SUSPENSION' => tr('E-Mail accounts are hard suspended'), 346 'TR_USER_INITIAL_LANG' => tr('Panel default language'), 347 'TR_SUPPORT_SYSTEM' => tr('Support system'), 348 'TR_ENABLED' => tr('Enabled'), 349 'TR_DISABLED' => tr('Disabled'), 350 'TR_APPLY_CHANGES' => tr('Apply changes'), 351 'TR_SERVERPORTS' => tr('Server ports'), 352 'TR_HOSTING_PLANS_LEVEL' => tr('Hosting plans available for'), 353 'TR_ADMIN' => tr('Admin'), 354 'TR_RESELLER' => tr('Reseller'), 355 'TR_DOMAIN_ROWS_PER_PAGE' => tr('Domains per page'), 356 'TR_LOG_LEVEL' => tr('Log Level'), 357 'TR_E_USER_OFF' => tr('Disabled'), 358 'TR_E_USER_NOTICE' => tr('Notices, Warnings and Errors'), 359 'TR_E_USER_WARNING' => tr('Warnings and Errors'), 360 'TR_E_USER_ERROR' => tr('Errors'), 361 'TR_CHECK_FOR_UPDATES' => tr('Check for update'), 362 'TR_SHOW_COMPRESSION_SIZE' => tr('Show compression size comment'), 363 'TR_PREVENT_EXTERNAL_LOGIN_ADMIN' => tr('Prevent external login for admins'), 364 'TR_PREVENT_EXTERNAL_LOGIN_RESELLER' => tr('Prevent external login for resellers'), 365 'TR_PREVENT_EXTERNAL_LOGIN_CLIENT' => tr('Prevent external login for clients'), 366 'TR_CUSTOM_ORDERPANEL_ID' => tr('Custom orderpanel ID'), 367 'TR_DNAMES_VALIDATION_SETTINGS' => tr('Domain names validation'), 368 'TR_TLD_STRICT_VALIDATION' => tr('Top Level Domain name strict validation'), 369 'TR_TLD_STRICT_VALIDATION_HELP' => tr('Only Top Level Domains (TLD) listed in IANA root zone database can be used.'), 370 'TR_SLD_STRICT_VALIDATION' => tr('Second Level Domain name strict validation'), 371 'TR_SLD_STRICT_VALIDATION_HELP' => tr('Single letter Second Level Domains (SLD) are not allowed under the most Top Level Domains (TLD). There is a small list of exceptions, e.g. the TLD .de.'), 372 'TR_MAX_DNAMES_LABELS' => tr('Maximal number of labels for domain names<br />(<i>Excluding SLD & TLD</i>)'), 373 'TR_MAX_SUBDNAMES_LABELS' => tr('Maximal number of labels for subdomains') 322 'TR_GENERAL_SETTINGS' => tr('General settings'), 323 'TR_SETTINGS' => tr('Settings'), 324 'TR_MESSAGE' => tr('Message'), 325 'TR_LOSTPASSWORD' => tr('Lost password'), 326 'TR_LOSTPASSWORD_TIMEOUT' => 327 tr('Activation link expire time (minutes)'), 328 'TR_PASSWORD_SETTINGS' => tr('Password settings'), 329 'TR_PASSWD_STRONG' => tr('Use strong Passwords'), 330 'TR_PASSWD_CHARS' => tr('Password length'), 331 'TR_BRUTEFORCE' => tr('Bruteforce detection'), 332 'TR_BRUTEFORCE_BETWEEN' => tr('Block time between logins'), 333 'TR_BRUTEFORCE_MAX_LOGIN' => tr('Max number of login attempts'), 334 'TR_BRUTEFORCE_BLOCK_TIME' => tr('Blocktime (minutes)'), 335 'TR_BRUTEFORCE_BETWEEN_TIME' => 336 tr('Block time between logins (seconds)'), 337 'TR_BRUTEFORCE_MAX_CAPTCHA' => 338 tr('Max number of CAPTCHA validation attempts'), 339 'TR_OTHER_SETTINGS' => tr('Other settings'), 340 'TR_MAIL_SETTINGS' => tr('E-Mail settings'), 341 'TR_CREATE_DEFAULT_EMAIL_ADDRESSES' => 342 tr('Create default E-Mail addresses'), 343 'TR_COUNT_DEFAULT_EMAIL_ADDRESSES' => 344 tr('Count default E-Mail addresses'), 345 'TR_HARD_MAIL_SUSPENSION' => tr('E-Mail accounts are hard suspended'), 346 'TR_USER_INITIAL_LANG' => tr('Panel default language'), 347 'TR_SUPPORT_SYSTEM' => tr('Support system'), 348 'TR_ENABLED' => tr('Enabled'), 349 'TR_DISABLED' => tr('Disabled'), 350 'TR_APPLY_CHANGES' => tr('Apply changes'), 351 'TR_SERVERPORTS' => tr('Server ports'), 352 'TR_HOSTING_PLANS_LEVEL' => tr('Hosting plans available for'), 353 'TR_ADMIN' => tr('Admin'), 354 'TR_RESELLER' => tr('Reseller'), 355 'TR_DOMAIN_ROWS_PER_PAGE' => tr('Domains per page'), 356 'TR_LOG_LEVEL' => tr('Log Level'), 357 'TR_E_USER_OFF' => tr('Disabled'), 358 'TR_E_USER_NOTICE' => tr('Notices, Warnings and Errors'), 359 'TR_E_USER_WARNING' => tr('Warnings and Errors'), 360 'TR_E_USER_ERROR' => tr('Errors'), 361 'TR_CHECK_FOR_UPDATES' => tr('Check for update'), 362 'TR_SHOW_COMPRESSION_SIZE' => tr('Show compression size comment'), 363 'TR_PREVENT_EXTERNAL_LOGIN_ADMIN' => 364 tr('Prevent external login for admins'), 365 'TR_PREVENT_EXTERNAL_LOGIN_RESELLER' => 366 tr('Prevent external login for resellers'), 367 'TR_PREVENT_EXTERNAL_LOGIN_CLIENT' => 368 tr('Prevent external login for clients'), 369 'TR_CUSTOM_ORDERPANEL_ID' => tr('Custom orderpanel ID'), 370 'TR_DNAMES_VALIDATION_SETTINGS' => tr('Domain names validation'), 371 'TR_TLD_STRICT_VALIDATION' => 372 tr('Top Level Domain name strict validation'), 373 'TR_TLD_STRICT_VALIDATION_HELP' => 374 tr('Only Top Level Domains (TLD) listed in IANA root zone database can be used.'), 375 'TR_SLD_STRICT_VALIDATION' => 376 tr('Second Level Domain name strict validation'), 377 'TR_SLD_STRICT_VALIDATION_HELP' => 378 tr('Single letter Second Level Domains (SLD) are not allowed under the most Top Level Domains (TLD). There is a small list of exceptions, e.g. the TLD .de.'), 379 'TR_MAX_DNAMES_LABELS' => 380 tr('Maximal number of labels for domain names<br />(<i>Excluding SLD & TLD</i>)'), 381 'TR_MAX_SUBDNAMES_LABELS' => 382 tr('Maximal number of labels for subdomains') 374 383 ) 375 384 ); … … 380 389 $tpl->prnt(); 381 390 382 if ( Config::getInstance()->get('DUMP_GUI_DEBUG')) {391 if ($main_cfg->DUMP_GUI_DEBUG) { 383 392 dump_gui_debug(); 384 393 } 394 385 395 unset_messages(); -
trunk/gui/include/admin-functions.php
r2929 r2938 2149 2149 } 2150 2150 2151 /** 2152 * @deprecated since 1.0.6 (Will be removed) 2153 */ 2151 2154 function setConfig_Value($name, $value) { 2152 2155 $sql = Database::getInstance(); -
trunk/gui/include/class.Database.php
r2599 r2938 53 53 } 54 54 return self::$_instances[$connection]; 55 } 56 57 /** 58 * Return a raw PDO instance 59 * 60 * @since 1.0.6 61 * @param $string $connection connection key name 62 * @throws Exception 63 * @return raw PDO instance 64 */ 65 public static function getRawInstance($connection = 'default') { 66 if (!isset(self::$_instances[$connection])) { 67 throw new Exception('Database error: Not connected to ' . $connection); 68 } 69 70 return self::$_instances[$connection]->_db; 55 71 } 56 72 -
trunk/gui/include/class.DatabaseResult.php
- Property svn:keywords set to Id
-
trunk/gui/include/class.SystemInfo.php
- Property svn:executable deleted
- Property svn:keywords set to Id
-
trunk/gui/include/class.versionUpdate.php
- Property svn:keywords set to Id
-
trunk/gui/include/ispcp-lib.php
r2928 r2938 36 36 37 37 function autoload_class($className) { 38 require_once(INCLUDEPATH . "/class.$className.php"); 38 39 if(file_exists(INCLUDEPATH . "/class.$className.php")) { 40 41 require_once INCLUDEPATH . "/class.$className.php"; 42 43 } elseif(file_exists(INCLUDEPATH . "/IspCP/$className.php")) { 44 45 require_once INCLUDEPATH . "/IspCP/$className.php"; 46 47 } else { 48 $path = str_replace('_', '/', $className); 49 50 if(file_exists(INCLUDEPATH . '/' . $path.'.php')) { 51 require_once INCLUDEPATH . '/' . $path.'.php'; 52 } 53 } 39 54 } 40 55 … … 55 70 require_once(INCLUDEPATH . '/i18n.php'); 56 71 72 // Get configuration parameters from ispcp.conf file 73 $main_cfg =& Config::getInstance(); 74 57 75 // Template pathes 58 Config::getInstance()->set('ROOT_TEMPLATE_PATH', 'themes/'); 59 Config::getInstance()->set('USER_INITIAL_THEME', 'omega_original'); 60 61 // Get the root directory templates path 62 $root_tpl_path = Config::getInstance()->get('ROOT_TEMPLATE_PATH'); 63 64 // Get user initial theme 65 $user_initial_theme = Config::getInstance()->get('USER_INITIAL_THEME'); 76 $main_cfg['ROOT_TEMPLATE_PATH'] = 'themes/'; 77 $main_cfg['USER_INITIAL_THEME'] = 'omega_original'; 78 79 // Get template path 80 $tpl_path = $main_cfg['ROOT_TEMPLATE_PATH'] . $main_cfg['USER_INITIAL_THEME'] ; 66 81 67 82 // Set the login templates path 68 Config::getInstance()->set( 69 'LOGIN_TEMPLATE_PATH', 70 $root_tpl_path . $user_initial_theme 71 ); 72 73 // Set the GUI admin level templates path 74 Config::getInstance()->set( 75 'ADMIN_TEMPLATE_PATH', 76 '../' . $root_tpl_path . $user_initial_theme . '/admin' 77 ); 78 79 // Set the GUI reseller level templates path 80 Config::getInstance()->set( 81 'RESELLER_TEMPLATE_PATH', 82 '../' . $root_tpl_path . $user_initial_theme . '/reseller' 83 ); 84 85 // Set the GUI client level templates path 86 Config::getInstance()->set( 87 'CLIENT_TEMPLATE_PATH', 88 '../' . $root_tpl_path . $user_initial_theme . '/client' 89 ); 83 $main_cfg['LOGIN_TEMPLATE_PATH'] = $tpl_path; 84 85 // Set the users level templates path 86 $main_cfg['ADMIN_TEMPLATE_PATH'] = '../' . $tpl_path . '/admin'; 87 $main_cfg['RESELLER_TEMPLATE_PATH'] = '../' . $tpl_path . '/reseller'; 88 $main_cfg['CLIENT_TEMPLATE_PATH'] = '../' . $tpl_path . '/client'; 90 89 91 90 // Set the isCP logo path 92 Config::getInstance()->set('IPS_LOGO_PATH', '../themes/user_logos');91 $main_cfg['IPS_LOGO_PATH'] = '../themes/user_logos'; 93 92 94 93 // Set the order panel templates path 95 Config::getInstance()->set( 96 'PURCHASE_TEMPLATE_PATH', 97 '../' . $root_tpl_path . $user_initial_theme . '/orderpanel' 98 ); 94 $main_cfg['PURCHASE_TEMPLATE_PATH'] = '../' . $tpl_path . '/orderpanel'; 99 95 100 96 // set often used HTML template strings 101 97 // RegEx: \s*([a-zA-Z]+)\s*\=\s*([\\]{0,1}[\"\'])\1\2 102 Config::getInstance()->set('HTML_CHECKED', ' checked="checked"');103 Config::getInstance()->set('HTML_DISABLED', ' disabled="disabled"');104 Config::getInstance()->set('HTML_READONLY', ' readonly="readonly"');105 Config::getInstance()->set('HTML_SELECTED', ' selected="selected"');98 $main_cfg['HTML_CHECKED'] = ' checked="checked"'; 99 $main_cfg['HTML_DISABLED'] = ' disabled="disabled"'; 100 $main_cfg['HTML_READONLY'] = ' readonly="readonly"'; 101 $main_cfg['HTML_SELECTED'] = ' selected="selected"'; 106 102 107 103 // Standard Language (if not set) 108 Config::getInstance()->set('USER_INITIAL_LANG', 'lang_EnglishBritain');104 $main_cfg['USER_INITIAL_LANG'] = 'lang_EnglishBritain'; 109 105 110 106 require_once(INCLUDEPATH . '/system-message.php'); … … 113 109 114 110 // variable for development edition: show all php variables beyond page content 115 Config::getInstance()->set('DUMP_GUI_DEBUG', DISABLE);111 $main_cfg['DUMP_GUI_DEBUG'] = DISABLE; 116 112 117 113 // show spGZIP compression information in HTML output 118 Config::getInstance()->set('SHOW_COMPRESSION_SIZE', ENABLE);114 $main_cfg['SHOW_COMPRESSION_SIZE'] = ENABLE; 119 115 120 116 // Session timeout in minutes 121 Config::getInstance()->set('SESSION_TIMEOUT', 30);117 $main_cfg['SESSION_TIMEOUT'] = 30; 122 118 123 119 // Item states 124 Config::getInstance()->set('ITEM_ADD_STATUS', 'toadd');125 Config::getInstance()->set('ITEM_OK_STATUS', 'ok');126 Config::getInstance()->set('ITEM_CHANGE_STATUS', 'change');127 Config::getInstance()->set('ITEM_DELETE_STATUS', 'delete');128 Config::getInstance()->set('ITEM_DISABLED_STATUS', 'disabled');129 Config::getInstance()->set('ITEM_RESTORE_STATUS', 'restore');130 Config::getInstance()->set('ITEM_TOENABLE_STATUS', 'toenable');131 Config::getInstance()->set('ITEM_TODISABLED_STATUS', 'todisable');132 Config::getInstance()->set('ITEM_ORDERED_STATUS', 'ordered');133 Config::getInstance()->set('ITEM_DNSCHANGE_STATUS', 'dnschange');120 $main_cfg['ITEM_ADD_STATUS'] = 'toadd'; 121 $main_cfg['ITEM_OK_STATUS'] = 'ok'; 122 $main_cfg['ITEM_CHANGE_STATUS'] = 'change'; 123 $main_cfg['ITEM_DELETE_STATUS'] = 'delete'; 124 $main_cfg['ITEM_DISABLED_STATUS'] = 'disabled'; 125 $main_cfg['ITEM_RESTORE_STATUS'] = 'restore'; 126 $main_cfg['ITEM_TOENABLE_STATUS'] = 'toenable'; 127 $main_cfg['ITEM_TODISABLED_STATUS'] = 'todisable'; 128 $main_cfg['ITEM_ORDERED_STATUS'] = 'ordered'; 129 $main_cfg['ITEM_DNSCHANGE_STATUS'] = 'dnschange'; 134 130 135 131 // SQL variables 136 Config::getInstance()->set('MAX_SQL_DATABASE_LENGTH', 64);137 Config::getInstance()->set('MAX_SQL_USER_LENGTH', 16);138 Config::getInstance()->set('MAX_SQL_PASS_LENGTH', 32);132 $main_cfg['MAX_SQL_DATABASE_LENGTH'] = 64; 133 $main_cfg['MAX_SQL_USER_LENGTH'] = 16; 134 $main_cfg['MAX_SQL_PASS_LENGTH'] = 32; 139 135 140 136 /** … … 143 139 144 140 // Domain rows pagination 145 Config::getInstance()->set('DOMAIN_ROWS_PER_PAGE', 10);141 $main_cfg['DOMAIN_ROWS_PER_PAGE'] = 10; 146 142 147 143 // 'admin': hosting plans are available only in admin level, the reseller 148 144 // cannot make custom changes 149 145 // 'reseller': hosting plans are available only in reseller level 150 Config::getInstance()->set('HOSTING_PLANS_LEVEL', 'reseller'); 151 146 $main_cfg['HOSTING_PLANS_LEVEL'] = 'reseller'; 152 147 153 148 // TLD strict validation (according IANA database) 154 Config::getInstance()->set('TLD_STRICT_VALIDATION', ENABLE);149 $main_cfg['TLD_STRICT_VALIDATION'] = ENABLE; 155 150 156 151 // SLD strict validation 157 Config::getInstance()->set('SLD_STRICT_VALIDATION', ENABLE);152 $main_cfg['SLD_STRICT_VALIDATION'] = ENABLE; 158 153 159 154 // Maximum number of labels for the domain names 160 155 // and subdomains (excluding SLD and TLD) 161 Config::getInstance()->set('MAX_DNAMES_LABELS', 1);156 $main_cfg['MAX_DNAMES_LABELS'] = 1; 162 157 163 158 // Maximum number of labels for the subdomain names 164 Config::getInstance()->set('MAX_SUBDNAMES_LABELS', 1);159 $main_cfg['MAX_SUBDNAMES_LABELS'] = 1; 165 160 166 161 // Enable or disable support system 167 Config::getInstance()->set('ISPCP_SUPPORT_SYSTEM', ENABLE);162 $main_cfg['ISPCP_SUPPORT_SYSTEM'] = ENABLE; 168 163 169 164 // Enable or disable lost password support 170 Config::getInstance()->set('LOSTPASSWORD', ENABLE);165 $main_cfg['LOSTPASSWORD'] = ENABLE; 171 166 172 167 // Uniqkeytimeout in minutes 173 Config::getInstance()->set('LOSTPASSWORD_TIMEOUT', 30);168 $main_cfg['LOSTPASSWORD_TIMEOUT'] = 30; 174 169 175 170 // Captcha imagewidth 176 Config::getInstance()->set('LOSTPASSWORD_CAPTCHA_WIDTH', 280);171 $main_cfg['LOSTPASSWORD_CAPTCHA_WIDTH'] = 280; 177 172 178 173 // Captcha imagehigh 179 Config::getInstance()->set('LOSTPASSWORD_CAPTCHA_HEIGHT', 70);174 $main_cfg['LOSTPASSWORD_CAPTCHA_HEIGHT'] = 70; 180 175 181 176 // Captcha background color 182 Config::getInstance()->set('LOSTPASSWORD_CAPTCHA_BGCOLOR', array(229,243,252));177 $main_cfg['LOSTPASSWORD_CAPTCHA_BGCOLOR'] = array(229, 243, 252); 183 178 184 179 // Captcha text color 185 Config::getInstance()->set('LOSTPASSWORD_CAPTCHA_TEXTCOLOR', array(0,53,92));180 $main_cfg['LOSTPASSWORD_CAPTCHA_TEXTCOLOR'] = array(0, 53, 92); 186 181 187 182 /** … … 197 192 198 193 // Set random catcha font file 199 Config::getInstance()->set( 200 'LOSTPASSWORD_CAPTCHA_FONT', 201 INCLUDEPATH.'/fonts/' . $fonts[mt_rand(0, count($fonts)-1)] 202 ); 194 $main_cfg['LOSTPASSWORD_CAPTCHA_FONT'] = INCLUDEPATH . '/fonts/' . 195 $fonts[mt_rand(0, count($fonts)-1)]; 203 196 204 197 // Enable or disable bruteforcedetection 205 Config::getInstance()->set('BRUTEFORCE', ENABLE);198 $main_cfg['BRUTEFORCE'] = ENABLE; 206 199 207 200 // Blocktime in minutes 208 Config::getInstance()->set('BRUTEFORCE_BLOCK_TIME', 30);201 $main_cfg['BRUTEFORCE_BLOCK_TIME'] = 30; 209 202 210 203 // Max login before block 211 Config::getInstance()->set('BRUTEFORCE_MAX_LOGIN', 3);204 $main_cfg['BRUTEFORCE_MAX_LOGIN'] = 3; 212 205 213 206 // Max captcha failed attempts before block 214 Config::getInstance()->set('BRUTEFORCE_MAX_CAPTCHA', 5);207 $main_cfg['BRUTEFORCE_MAX_CAPTCHA'] = 5; 215 208 216 209 // Enable or disable time between logins 217 Config::getInstance()->set('BRUTEFORCE_BETWEEN', ENABLE);210 $main_cfg['BRUTEFORCE_BETWEEN'] = ENABLE; 218 211 219 212 // Time between logins in seconds 220 Config::getInstance()->set('BRUTEFORCE_BETWEEN_TIME', 30);213 $main_cfg['BRUTEFORCE_BETWEEN_TIME'] = 30; 221 214 222 215 // Enable or disable maintenance mode 223 Config::getInstance()->set('MAINTENANCEMODE', DISABLE);216 $main_cfg['MAINTENANCEMODE'] = DISABLE; 224 217 225 218 // Servicemode message 226 Config::getInstance()->set( 227 'MAINTENANCEMODE_MESSAGE', 228 tr("We are sorry, but the system is currently under maintenance.\nPlease try again later.") 229 ); 219 $main_cfg['MAINTENANCEMODE_MESSAGE'] = 220 tr("We are sorry, but the system is currently under maintenance.\nPlease try again later."); 230 221 231 222 // Restore language auto detection … … 233 224 234 225 // Minimum password chars 235 Config::getInstance()->set('PASSWD_CHARS', 6);226 $main_cfg['PASSWD_CHARS'] = 6; 236 227 237 228 // Enable or disable strong passwords 238 Config::getInstance()->set('PASSWD_STRONG', ENABLE);229 $main_cfg['PASSWD_STRONG'] = ENABLE; 239 230 240 231 // The virtual host file from Apache which contains our virtual host entries 241 Config::getInstance()->set( 242 'SERVER_VHOST_FILE', 243 Config::getInstance()->get('APACHE_SITES_DIR') . '/ispcp.conf' 244 ); 232 $main_cfg['SERVER_VHOST_FILE'] = $main_cfg['APACHE_SITES_DIR'] . '/ispcp.conf'; 245 233 246 234 // The minimum level for a message to be sent to DEFAULT_ADMIN_ADDRESS … … 249 237 // E_USER_WARNING: switching to an other account, etc 250 238 // E_USER_ERROR: "admin MUST know" messages 251 Config::getInstance()->set('LOG_LEVEL', E_USER_NOTICE);239 $main_cfg['LOG_LEVEL'] = E_USER_NOTICE; 252 240 253 241 // Creation of webmaster, postmaster and abuse forwarders when domain/alias/ 254 242 // subdomain is created 255 Config::getInstance()->set('CREATE_DEFAULT_EMAIL_ADDRESSES', ENABLE);243 $main_cfg['CREATE_DEFAULT_EMAIL_ADDRESSES'] = ENABLE; 256 244 257 245 // Count default e-mail addresses (abuse,postmaster,webmaster) in user limit 258 246 // ENABLE: default e-mail are counted 259 247 // DISABLE: default e-mail are NOT counted 260 Config::getInstance()->set('COUNT_DEFAULT_EMAIL_ADDRESSES', ENABLE);248 $main_cfg['COUNT_DEFAULT_EMAIL_ADDRESSES'] = ENABLE; 261 249 262 250 // Use hard mail suspension when suspending a domain: … … 264 252 // DISABLE: email accounts are soft suspended (passwords are modified so user 265 253 // can't access the accounts) 266 Config::getInstance()->set('HARD_MAIL_SUSPENSION', ENABLE);254 $main_cfg['HARD_MAIL_SUSPENSION'] = ENABLE; 267 255 268 256 // Prevent external login (i.e. check for valid local referer) … … 271 259 // ENABLE: prevent external login, check for referer, more secure 272 260 // DISABLE: allow external login, do not check for referere, less security (risky) 273 Config::getInstance()->set('PREVENT_EXTERNAL_LOGIN_ADMIN', ENABLE);274 Config::getInstance()->set('PREVENT_EXTERNAL_LOGIN_RESELLER', ENABLE);275 Config::getInstance()->set('PREVENT_EXTERNAL_LOGIN_CLIENT', ENABLE);261 $main_cfg['PREVENT_EXTERNAL_LOGIN_ADMIN'] = ENABLE; 262 $main_cfg['PREVENT_EXTERNAL_LOGIN_RESELLER'] = ENABLE; 263 $main_cfg['PREVENT_EXTERNAL_LOGIN_CLIENT'] = ENABLE; 276 264 277 265 // Automatic search for new version 278 Config::getInstance()->set('CHECK_FOR_UPDATES', ENABLE);279 280 if (!Config::getInstance()->get('ISPCP_SUPPORT_SYSTEM_TARGET')) {281 Config::getInstance()->set('ISPCP_SUPPORT_SYSTEM_TARGET', '_self');266 $main_cfg['CHECK_FOR_UPDATES'] = ENABLE; 267 268 if(!$main_cfg['ISPCP_SUPPORT_SYSTEM_TARGET']) { 269 $main_cfg['ISPCP_SUPPORT_SYSTEM_TARGET'] = '_self'; 282 270 } 283 271 … … 298 286 require_once(INCLUDEPATH . '/functions.ticket_system.php'); 299 287 300 $query = "SELECT `name`, `value` FROM `config`"; 301 302 if (!$res = exec_query($sql, $query, array())) { 303 system_message(tr('Could not get config from database')); 304 } else { 305 while ($row = $res->FetchRow()) { 306 Config::getInstance()->set($row['name'], $row['value']); 307 } 308 } 288 // Override all the default parameters with the user defined parameters that are 289 // stored in the database 290 $main_cfg->replace_with( 291 Config::getInstance(Config::DB, Database::getRawInstance()) 292 ); 309 293 310 294 // Compress/gzip Class 311 295 require_once(INCLUDEPATH . '/class.spGzip.php'); 296 312 297 // Check if server information is enabled 313 298 // Note: If we receive a xhr request, the value must be forced to FALSE 314 $showCompression = 315 (Config::getInstance()->get('SHOW_COMPRESSION_SIZE')) ? !is_xhr() : false; 299 $showCompression = $main_cfg['SHOW_COMPRESSION_SIZE'] ? !is_xhr() : false; 300 316 301 // construct the object 317 302 $GLOBALS['class']['output'] = new spOutput('auto', false, $showCompression); 303 318 304 // Start the output buffering 319 305 ob_start(array($GLOBALS['class']['output'], 'output')); -
trunk/gui/include/reseller-functions.php
r2923 r2938 1216 1216 * @todo implement use of more secure dynamic table in SQL query 1217 1217 */ 1218 function gen_def_language(&$tpl, &$sql, &$user_def_language) {1218 function gen_def_language(&$tpl, &$sql, $user_def_language) { 1219 1219 $matches = array(); 1220 1220 $languages = array();
Note: See TracChangeset
for help on using the changeset viewer.
