Changeset 2940


Ignore:
Timestamp:
05/29/10 05:47:42 (21 months ago)
Author:
nuxwin
Message:
  • [GUI] Added constant for ConfigHandler? support in the Config class
  • [GUI] Added IspCP_Registry class to store shared data
  • [GUI] Changed ispcp-lib.php and admin/settings.php for usage example of the new IspCP_Registry class
  • [GUI] Fixed some typo issue in Config class
Location:
trunk
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/CHANGELOG

    r2938 r2940  
    11ispCP ω 1.0.6 ChangeLog 
    22~~~~~~~~~~~~~~~~~~~~~~~~~~ 
     3 
     42010-05-29 Laurent Declercq 
     5        - GUI: 
     6                * Added constant for ConfigHandler support in the Config class 
     7                * Added IspCP_Registry class to store shared data 
     8                * Changed ispcp-lib.php and admin/settings.php for usage example of the 
     9                        new IspCP_Registry class 
     10                * Fixed some typo issue in Config class 
    311 
    4122010-05-28 Laurent Declercq 
    … …  
    917                * Added IspCP_ConfigHandler adapter class to handle config parameter 
    1018                        from a database 
    11                 * Changed admin/setting.php to use new IspCP_ConfigHandler interface 
     19                * Changed admin/settings.php to use new IspCP_ConfigHandler interface 
    1220                * Changed include/ispcp-lib.php to use new IspCP_ConfigHandler interface 
    1321                * Fixed gen_def_language(): Initial language string should not be passed 

  • trunk/gui/admin/settings.php

    r2938 r2940  
    3333check_login(__FILE__); 
    3434 
     35// Get a reference to the Config object 
     36$cfg = IspCP_Registry::get('Config'); 
     37 
    3538$tpl = new pTemplate(); 
    36 $tpl->define_dynamic('page', $main_cfg->ADMIN_TEMPLATE_PATH . '/settings.tpl'); 
     39$tpl->define_dynamic('page', $cfg->ADMIN_TEMPLATE_PATH . '/settings.tpl'); 
    3740$tpl->define_dynamic('def_language', 'page'); 
    3841 
    … …  
    4043        array( 
    4144                'TR_ADMIN_SETTINGS_PAGE_TITLE' => tr('ispCP - Admin/Settings'), 
    42                 'THEME_COLOR_PATH' => "../themes/{$main_cfg->USER_INITIAL_THEME}", 
     45                'THEME_COLOR_PATH' => "../themes/{$cfg->USER_INITIAL_THEME}", 
    4346                'THEME_CHARSET' => tr('encoding'), 
    4447                'ISP_LOGO' => get_logo($_SESSION['user_id']) 
    … …  
    9497                $max_subdnames_labels = 1; 
    9598        } else { 
    96                 $db_cfg =& Config::getInstance(Config::DB); 
     99 
     100                // Get a reference to the DB_Config Objects 
     101                $db_cfg = ispCP_Registry::get('Db_Config'); 
    97102 
    98103                $db_cfg->LOSTPASSWORD = $lostpwd; 
    … …  
    125130                $db_cfg->MAX_SUBDNAMES_LABELS = $max_subdnames_labels; 
    126131 
    127                 $main_cfg->replace_with($db_cfg); 
     132                $cfg->replace_with($db_cfg); 
    128133 
    129134                set_page_message(tr('Settings saved!')); 
    … …  
    131136} 
    132137 
    133 $coid = isset($main_cfg->CUSTOM_ORDERPANEL_ID) 
    134         ? $main_cfg->CUSTOM_ORDERPANEL_ID 
     138$coid = isset($cfg->CUSTOM_ORDERPANEL_ID) 
     139        ? $cfg->CUSTOM_ORDERPANEL_ID 
    135140        : ''; 
    136141 
    137142$tpl->assign( 
    138143        array( 
    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, 
     144                'LOSTPASSWORD_TIMEOUT_VALUE' => $cfg->LOSTPASSWORD_TIMEOUT, 
     145                'PASSWD_CHARS' => $cfg->PASSWD_CHARS, 
     146                'BRUTEFORCE_MAX_LOGIN_VALUE' => $cfg->BRUTEFORCE_MAX_LOGIN, 
     147                'BRUTEFORCE_BLOCK_TIME_VALUE' => $cfg->BRUTEFORCE_BLOCK_TIME, 
     148                'BRUTEFORCE_BETWEEN_TIME_VALUE' => $cfg->BRUTEFORCE_BETWEEN_TIME, 
     149                'BRUTEFORCE_MAX_CAPTCHA' => $cfg->BRUTEFORCE_MAX_CAPTCHA, 
     150                'DOMAIN_ROWS_PER_PAGE' => $cfg->DOMAIN_ROWS_PER_PAGE, 
    146151                'CUSTOM_ORDERPANEL_ID' => $coid, 
    147                 'MAX_DNAMES_LABELS_VALUE' => $main_cfg->MAX_DNAMES_LABELS, 
    148                 'MAX_SUBDNAMES_LABELS_VALUE' => $main_cfg->MAX_SUBDNAMES_LABELS 
     152                'MAX_DNAMES_LABELS_VALUE' => $cfg->MAX_DNAMES_LABELS, 
     153                'MAX_SUBDNAMES_LABELS_VALUE' => $cfg->MAX_SUBDNAMES_LABELS 
    149154        ) 
    150155); 
    151156 
    152 //$language = $cfg['USER_INITIAL_LANG']; 
    153 gen_def_language($tpl, $sql, $main_cfg['USER_INITIAL_LANG']); 
     157gen_def_language($tpl, $sql, $cfg['USER_INITIAL_LANG']); 
    154158 
    155159// Grab the value only once to improve performances 
    156 $html_selected = $main_cfg['HTML_SELECTED']; 
    157  
    158 if ($main_cfg->LOSTPASSWORD) { 
     160$html_selected = $cfg['HTML_SELECTED']; 
     161 
     162if ($cfg->LOSTPASSWORD) { 
    159163        $tpl->assign('LOSTPASSWORD_SELECTED_ON', $html_selected); 
    160164        $tpl->assign('LOSTPASSWORD_SELECTED_OFF', ''); 
    … …  
    164168} 
    165169 
    166 if ($main_cfg->PASSWD_STRONG) { 
     170if ($cfg->PASSWD_STRONG) { 
    167171        $tpl->assign('PASSWD_STRONG_ON', $html_selected); 
    168172        $tpl->assign('PASSWD_STRONG_OFF', ''); 
    … …  
    172176} 
    173177 
    174 if ($main_cfg->BRUTEFORCE) { 
     178if ($cfg->BRUTEFORCE) { 
    175179        $tpl->assign('BRUTEFORCE_SELECTED_ON', $html_selected); 
    176180        $tpl->assign('BRUTEFORCE_SELECTED_OFF', ''); 
    … …  
    180184} 
    181185 
    182 if ($main_cfg->BRUTEFORCE_BETWEEN) { 
     186if ($cfg->BRUTEFORCE_BETWEEN) { 
    183187        $tpl->assign('BRUTEFORCE_BETWEEN_SELECTED_ON', $html_selected); 
    184188        $tpl->assign('BRUTEFORCE_BETWEEN_SELECTED_OFF', ''); 
    … …  
    188192} 
    189193 
    190 if ($main_cfg->ISPCP_SUPPORT_SYSTEM) { 
     194if ($cfg->ISPCP_SUPPORT_SYSTEM) { 
    191195        $tpl->assign('SUPPORT_SYSTEM_SELECTED_ON', $html_selected); 
    192196        $tpl->assign('SUPPORT_SYSTEM_SELECTED_OFF', ''); 
    … …  
    196200} 
    197201 
    198 if ($main_cfg->TLD_STRICT_VALIDATION) { 
     202if ($cfg->TLD_STRICT_VALIDATION) { 
    199203        $tpl->assign('TLD_STRICT_VALIDATION_ON', $html_selected); 
    200204        $tpl->assign('TLD_STRICT_VALIDATION_OFF', ''); 
    … …  
    204208} 
    205209 
    206 if ($main_cfg->SLD_STRICT_VALIDATION) { 
     210if ($cfg->SLD_STRICT_VALIDATION) { 
    207211        $tpl->assign('SLD_STRICT_VALIDATION_ON', $html_selected); 
    208212        $tpl->assign('SLD_STRICT_VALIDATION_OFF', ''); 
    … …  
    212216} 
    213217 
    214 if ($main_cfg->CREATE_DEFAULT_EMAIL_ADDRESSES) { 
     218if ($cfg->CREATE_DEFAULT_EMAIL_ADDRESSES) { 
    215219        $tpl->assign('CREATE_DEFAULT_EMAIL_ADDRESSES_ON', $html_selected); 
    216220        $tpl->assign('CREATE_DEFAULT_EMAIL_ADDRESSES_OFF', ''); 
    … …  
    220224} 
    221225 
    222 if ($main_cfg->COUNT_DEFAULT_EMAIL_ADDRESSES) { 
     226if ($cfg->COUNT_DEFAULT_EMAIL_ADDRESSES) { 
    223227        $tpl->assign('COUNT_DEFAULT_EMAIL_ADDRESSES_ON', $html_selected); 
    224228        $tpl->assign('COUNT_DEFAULT_EMAIL_ADDRESSES_OFF', ''); 
    … …  
    228232} 
    229233 
    230 if ($main_cfg->HARD_MAIL_SUSPENSION) { 
     234if ($cfg->HARD_MAIL_SUSPENSION) { 
    231235        $tpl->assign('HARD_MAIL_SUSPENSION_ON', $html_selected); 
    232236        $tpl->assign('HARD_MAIL_SUSPENSION_OFF', ''); 
    … …  
    236240} 
    237241 
    238 if ($main_cfg->HOSTING_PLANS_LEVEL == 'admin') { 
     242if ($cfg->HOSTING_PLANS_LEVEL == 'admin') { 
    239243        $tpl->assign('HOSTING_PLANS_LEVEL_ADMIN', $html_selected); 
    240244        $tpl->assign('HOSTING_PLANS_LEVEL_RESELLER', ''); 
    … …  
    244248} 
    245249 
    246 if ($main_cfg->CHECK_FOR_UPDATES) { 
     250if ($cfg->CHECK_FOR_UPDATES) { 
    247251        $tpl->assign('CHECK_FOR_UPDATES_SELECTED_ON', $html_selected); 
    248252        $tpl->assign('CHECK_FOR_UPDATES_SELECTED_OFF', ''); 
    … …  
    252256} 
    253257 
    254 if ($main_cfg->SHOW_COMPRESSION_SIZE) { 
     258if ($cfg->SHOW_COMPRESSION_SIZE) { 
    255259        $tpl->assign('SHOW_COMPRESSION_SIZE_SELECTED_ON', $html_selected); 
    256260        $tpl->assign('SHOW_COMPRESSION_SIZE_SELECTED_OFF', ''); 
    … …  
    260264} 
    261265 
    262 if ($main_cfg->PREVENT_EXTERNAL_LOGIN_ADMIN) { 
     266if ($cfg->PREVENT_EXTERNAL_LOGIN_ADMIN) { 
    263267        $tpl->assign('PREVENT_EXTERNAL_LOGIN_ADMIN_SELECTED_ON', $html_selected); 
    264268        $tpl->assign('PREVENT_EXTERNAL_LOGIN_ADMIN_SELECTED_OFF', ''); 
    … …  
    268272} 
    269273 
    270 if ($main_cfg->PREVENT_EXTERNAL_LOGIN_RESELLER) { 
     274if ($cfg->PREVENT_EXTERNAL_LOGIN_RESELLER) { 
    271275        $tpl->assign('PREVENT_EXTERNAL_LOGIN_RESELLER_SELECTED_ON', $html_selected); 
    272276        $tpl->assign('PREVENT_EXTERNAL_LOGIN_RESELLER_SELECTED_OFF', ''); 
    … …  
    276280} 
    277281 
    278 if ($main_cfg->PREVENT_EXTERNAL_LOGIN_CLIENT) { 
     282if ($cfg->PREVENT_EXTERNAL_LOGIN_CLIENT) { 
    279283        $tpl->assign('PREVENT_EXTERNAL_LOGIN_CLIENT_SELECTED_ON', $html_selected); 
    280284        $tpl->assign('PREVENT_EXTERNAL_LOGIN_CLIENT_SELECTED_OFF', ''); 
    … …  
    284288} 
    285289 
    286 switch ($main_cfg->LOG_LEVEL) { 
     290switch ($cfg->LOG_LEVEL) { 
    287291        case E_USER_OFF: 
    288292                $tpl->assign('LOG_LEVEL_SELECTED_OFF', $html_selected); 
    … …  
    315319 * 
    316320 */ 
    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'); 
     321gen_admin_mainmenu($tpl, $cfg->ADMIN_TEMPLATE_PATH . '/main_menu_settings.tpl'); 
     322gen_admin_menu($tpl, $cfg->ADMIN_TEMPLATE_PATH . '/menu_settings.tpl'); 
    319323 
    320324$tpl->assign( 
    … …  
    389393$tpl->prnt(); 
    390394 
    391 if ($main_cfg->DUMP_GUI_DEBUG) { 
     395if ($cfg->DUMP_GUI_DEBUG) { 
    392396        dump_gui_debug(); 
    393397} 

  • trunk/gui/include/IspCP/Config.php

    r2938 r2940  
    5050         */ 
    5151        const 
     52                ARR = 'IspCP_ConfigHandler', 
    5253                DB = 'IspCP_ConfigHandler_Db', 
    5354                FILE = 'IspCP_ConfigHandler_File', 
    … …  
    6566 
    6667        /** 
    67          * Get a Config_Handler object 
     68         * Get a IspCP_ConfigHandler instance 
    6869         * 
    69          * Returns a reference to a {@link IspCP_ConfigHandler} object, only 
     70         * Returns a reference to a {@link IspCP_ConfigHandler} instance, only 
    7071         * creating it if it doesn't already exist. 
    7172         * 

  • trunk/gui/include/ispcp-lib.php

    r2938 r2940  
    7070require_once(INCLUDEPATH . '/i18n.php'); 
    7171 
    72 // Get configuration parameters from ispcp.conf file 
    73 $main_cfg =& Config::getInstance(); 
     72// Create a registry to store shared data 
     73$reg = IspCP_Registry::getInstance(); 
     74 
     75// Get and register the main configuration data object 
     76$reg['Config'] = Config::getInstance(); 
    7477 
    7578// Template pathes 
    76 $main_cfg['ROOT_TEMPLATE_PATH'] = 'themes/'; 
    77 $main_cfg['USER_INITIAL_THEME'] = 'omega_original'; 
     79$reg['Config']['ROOT_TEMPLATE_PATH'] = 'themes/'; 
     80$reg['Config']['USER_INITIAL_THEME'] = 'omega_original'; 
    7881 
    7982// Get template path 
    80 $tpl_path = $main_cfg['ROOT_TEMPLATE_PATH'] . $main_cfg['USER_INITIAL_THEME'] ; 
     83$tpl_path = $reg['Config']['ROOT_TEMPLATE_PATH'] . 
     84        $reg['Config']['USER_INITIAL_THEME']; 
    8185 
    8286// Set the login templates path 
    83 $main_cfg['LOGIN_TEMPLATE_PATH'] = $tpl_path; 
     87$reg['Config']['LOGIN_TEMPLATE_PATH'] = $tpl_path; 
    8488 
    8589// 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$reg['Config']['ADMIN_TEMPLATE_PATH'] =  "../$tpl_path/admin"; 
     91$reg['Config']['RESELLER_TEMPLATE_PATH'] = "../$tpl_path/reseller"; 
     92$reg['Config']['CLIENT_TEMPLATE_PATH'] = "../$tpl_path/client"; 
    8993 
    9094// Set the isCP logo path 
    91 $main_cfg['IPS_LOGO_PATH'] = '../themes/user_logos'; 
     95$reg['Config']['IPS_LOGO_PATH'] = '../themes/user_logos'; 
    9296 
    9397// Set the order panel templates path 
    94 $main_cfg['PURCHASE_TEMPLATE_PATH'] = '../' . $tpl_path . '/orderpanel'; 
     98$reg['Config']['PURCHASE_TEMPLATE_PATH'] = "../$tpl_path/orderpanel"; 
    9599 
    96100// set often used HTML template strings 
    97101// RegEx: \s*([a-zA-Z]+)\s*\=\s*([\\]{0,1}[\"\'])\1\2 
    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"'; 
     102$reg['Config']['HTML_CHECKED'] = ' checked="checked"'; 
     103$reg['Config']['HTML_DISABLED'] = ' disabled="disabled"'; 
     104$reg['Config']['HTML_READONLY'] = ' readonly="readonly"'; 
     105$reg['Config']['HTML_SELECTED'] = ' selected="selected"'; 
    102106 
    103107// Standard Language (if not set) 
    104 $main_cfg['USER_INITIAL_LANG'] = 'lang_EnglishBritain'; 
     108$reg['Config']['USER_INITIAL_LANG'] = 'lang_EnglishBritain'; 
    105109 
    106110require_once(INCLUDEPATH . '/system-message.php'); 
    … …  
    109113 
    110114// variable for development edition: show all php variables beyond page content 
    111 $main_cfg['DUMP_GUI_DEBUG'] = DISABLE; 
     115$reg['Config']['DUMP_GUI_DEBUG'] = DISABLE; 
    112116 
    113117// show spGZIP compression information in HTML output 
    114 $main_cfg['SHOW_COMPRESSION_SIZE'] = ENABLE; 
     118$reg['Config']['SHOW_COMPRESSION_SIZE'] = ENABLE; 
    115119 
    116120// Session timeout in minutes 
    117 $main_cfg['SESSION_TIMEOUT'] = 30; 
     121$reg['Config']['SESSION_TIMEOUT'] = 30; 
    118122 
    119123// Item states 
    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'; 
     124$reg['Config']['ITEM_ADD_STATUS'] = 'toadd'; 
     125$reg['Config']['ITEM_OK_STATUS'] = 'ok'; 
     126$reg['Config']['ITEM_CHANGE_STATUS'] = 'change'; 
     127$reg['Config']['ITEM_DELETE_STATUS'] = 'delete'; 
     128$reg['Config']['ITEM_DISABLED_STATUS'] = 'disabled'; 
     129$reg['Config']['ITEM_RESTORE_STATUS'] = 'restore'; 
     130$reg['Config']['ITEM_TOENABLE_STATUS'] = 'toenable'; 
     131$reg['Config']['ITEM_TODISABLED_STATUS'] = 'todisable'; 
     132$reg['Config']['ITEM_ORDERED_STATUS'] = 'ordered'; 
     133$reg['Config']['ITEM_DNSCHANGE_STATUS'] = 'dnschange'; 
    130134 
    131135// SQL variables 
    132 $main_cfg['MAX_SQL_DATABASE_LENGTH'] = 64; 
    133 $main_cfg['MAX_SQL_USER_LENGTH'] = 16; 
    134 $main_cfg['MAX_SQL_PASS_LENGTH'] = 32; 
     136$reg['Config']['MAX_SQL_DATABASE_LENGTH'] = 64; 
     137$reg['Config']['MAX_SQL_USER_LENGTH'] = 16; 
     138$reg['Config']['MAX_SQL_PASS_LENGTH'] = 32; 
    135139 
    136140/** 
    … …  
    139143 
    140144// Domain rows pagination 
    141 $main_cfg['DOMAIN_ROWS_PER_PAGE'] = 10; 
     145$reg['Config']['DOMAIN_ROWS_PER_PAGE'] = 10; 
    142146 
    143147// 'admin': hosting plans are available only in admin level, the reseller 
    144148// cannot make custom changes 
    145149// 'reseller': hosting plans are available only in reseller level 
    146 $main_cfg['HOSTING_PLANS_LEVEL'] = 'reseller'; 
     150$reg['Config']['HOSTING_PLANS_LEVEL'] = 'reseller'; 
    147151 
    148152// TLD strict validation (according IANA database) 
    149 $main_cfg['TLD_STRICT_VALIDATION'] = ENABLE; 
     153$reg['Config']['TLD_STRICT_VALIDATION'] = ENABLE; 
    150154 
    151155// SLD strict validation 
    152 $main_cfg['SLD_STRICT_VALIDATION'] = ENABLE; 
     156$reg['Config']['SLD_STRICT_VALIDATION'] = ENABLE; 
    153157 
    154158// Maximum number of labels for the domain names 
    155159// and subdomains (excluding SLD and TLD) 
    156 $main_cfg['MAX_DNAMES_LABELS'] = 1; 
     160$reg['Config']['MAX_DNAMES_LABELS'] = 1; 
    157161 
    158162// Maximum number of labels for the subdomain names 
    159 $main_cfg['MAX_SUBDNAMES_LABELS'] = 1; 
     163$reg['Config']['MAX_SUBDNAMES_LABELS'] = 1; 
    160164 
    161165// Enable or disable support system 
    162 $main_cfg['ISPCP_SUPPORT_SYSTEM'] = ENABLE; 
     166$reg['Config']['ISPCP_SUPPORT_SYSTEM'] = ENABLE; 
    163167 
    164168// Enable or disable lost password support 
    165 $main_cfg['LOSTPASSWORD'] = ENABLE; 
     169$reg['Config']['LOSTPASSWORD'] = ENABLE; 
    166170 
    167171// Uniqkeytimeout in minutes 
    168 $main_cfg['LOSTPASSWORD_TIMEOUT'] = 30; 
     172$reg['Config']['LOSTPASSWORD_TIMEOUT'] = 30; 
    169173 
    170174// Captcha imagewidth 
    171 $main_cfg['LOSTPASSWORD_CAPTCHA_WIDTH'] = 280; 
     175$reg['Config']['LOSTPASSWORD_CAPTCHA_WIDTH'] = 280; 
    172176 
    173177// Captcha imagehigh 
    174 $main_cfg['LOSTPASSWORD_CAPTCHA_HEIGHT'] = 70; 
     178$reg['Config']['LOSTPASSWORD_CAPTCHA_HEIGHT'] = 70; 
    175179 
    176180// Captcha background color 
    177 $main_cfg['LOSTPASSWORD_CAPTCHA_BGCOLOR'] = array(229, 243, 252); 
     181$reg['Config']['LOSTPASSWORD_CAPTCHA_BGCOLOR'] = array(229, 243, 252); 
    178182 
    179183// Captcha text color 
    180 $main_cfg['LOSTPASSWORD_CAPTCHA_TEXTCOLOR'] = array(0, 53, 92); 
     184$reg['Config']['LOSTPASSWORD_CAPTCHA_TEXTCOLOR'] = array(0, 53, 92); 
    181185 
    182186/** 
    … …  
    192196 
    193197// Set random catcha font file 
    194 $main_cfg['LOSTPASSWORD_CAPTCHA_FONT'] = INCLUDEPATH . '/fonts/' . 
     198$reg['Config']['LOSTPASSWORD_CAPTCHA_FONT'] = INCLUDEPATH . '/fonts/' . 
    195199        $fonts[mt_rand(0, count($fonts)-1)]; 
    196200 
    197201// Enable or disable bruteforcedetection 
    198 $main_cfg['BRUTEFORCE'] = ENABLE; 
     202$reg['Config']['BRUTEFORCE'] = ENABLE; 
    199203 
    200204// Blocktime in minutes 
    201 $main_cfg['BRUTEFORCE_BLOCK_TIME'] = 30; 
     205$reg['Config']['BRUTEFORCE_BLOCK_TIME'] = 30; 
    202206 
    203207// Max login before block 
    204 $main_cfg['BRUTEFORCE_MAX_LOGIN'] = 3; 
     208$reg['Config']['BRUTEFORCE_MAX_LOGIN'] = 3; 
    205209 
    206210// Max captcha failed attempts before block 
    207 $main_cfg['BRUTEFORCE_MAX_CAPTCHA'] = 5; 
     211$reg['Config']['BRUTEFORCE_MAX_CAPTCHA'] = 5; 
    208212 
    209213// Enable or disable time between logins 
    210 $main_cfg['BRUTEFORCE_BETWEEN'] = ENABLE; 
     214$reg['Config']['BRUTEFORCE_BETWEEN'] = ENABLE; 
    211215 
    212216// Time between logins in seconds 
    213 $main_cfg['BRUTEFORCE_BETWEEN_TIME'] = 30; 
     217$reg['Config']['BRUTEFORCE_BETWEEN_TIME'] = 30; 
    214218 
    215219// Enable or disable maintenance mode 
    216 $main_cfg['MAINTENANCEMODE'] = DISABLE; 
     220$reg['Config']['MAINTENANCEMODE'] = DISABLE; 
    217221 
    218222// Servicemode message 
    219 $main_cfg['MAINTENANCEMODE_MESSAGE'] = 
     223$reg['Config']['MAINTENANCEMODE_MESSAGE'] = 
    220224        tr("We are sorry, but the system is currently under maintenance.\nPlease try again later."); 
    221225 
    … …  
    224228 
    225229// Minimum password chars 
    226 $main_cfg['PASSWD_CHARS'] = 6; 
     230$reg['Config']['PASSWD_CHARS'] = 6; 
    227231 
    228232// Enable or disable strong passwords 
    229 $main_cfg['PASSWD_STRONG'] = ENABLE; 
     233$reg['Config']['PASSWD_STRONG'] = ENABLE; 
    230234 
    231235// The virtual host file from Apache which contains our virtual host entries 
    232 $main_cfg['SERVER_VHOST_FILE'] = $main_cfg['APACHE_SITES_DIR'] . '/ispcp.conf'; 
     236$reg['Config']['SERVER_VHOST_FILE'] = 
     237        $reg['Config']['APACHE_SITES_DIR'] . '/ispcp.conf'; 
    233238 
    234239// The minimum level for a message to be sent to DEFAULT_ADMIN_ADDRESS 
    … …  
    237242// E_USER_WARNING: switching to an other account, etc 
    238243// E_USER_ERROR: "admin MUST know" messages 
    239 $main_cfg['LOG_LEVEL'] = E_USER_NOTICE; 
     244$reg['Config']['LOG_LEVEL'] = E_USER_NOTICE; 
    240245 
    241246// Creation of webmaster, postmaster and abuse forwarders when domain/alias/ 
    242247// subdomain is created 
    243 $main_cfg['CREATE_DEFAULT_EMAIL_ADDRESSES'] = ENABLE; 
     248$reg['Config']['CREATE_DEFAULT_EMAIL_ADDRESSES'] = ENABLE; 
    244249 
    245250// Count default e-mail addresses (abuse,postmaster,webmaster) in user limit 
    246251// ENABLE: default e-mail are counted 
    247252// DISABLE: default e-mail are NOT counted 
    248 $main_cfg['COUNT_DEFAULT_EMAIL_ADDRESSES'] = ENABLE; 
     253$reg['Config']['COUNT_DEFAULT_EMAIL_ADDRESSES'] = ENABLE; 
    249254 
    250255// Use hard mail suspension when suspending a domain: 
    … …  
    252257// DISABLE: email accounts are soft suspended (passwords are modified so user 
    253258// can't access the accounts) 
    254 $main_cfg['HARD_MAIL_SUSPENSION'] = ENABLE; 
     259$reg['Config']['HARD_MAIL_SUSPENSION'] = ENABLE; 
    255260 
    256261// Prevent external login (i.e. check for valid local referer) 
    … …  
    258263// This option allows to use external login scripts 
    259264// ENABLE: prevent external login, check for referer, more secure 
    260 // DISABLE: allow external login, do not check for referere, less security (risky) 
    261 $main_cfg['PREVENT_EXTERNAL_LOGIN_ADMIN'] = ENABLE; 
    262 $main_cfg['PREVENT_EXTERNAL_LOGIN_RESELLER'] = ENABLE; 
    263 $main_cfg['PREVENT_EXTERNAL_LOGIN_CLIENT'] = ENABLE; 
     265// DISABLE: allow external login, do not check for referer, less security (risky) 
     266$reg['Config']['PREVENT_EXTERNAL_LOGIN_ADMIN'] = ENABLE; 
     267$reg['Config']['PREVENT_EXTERNAL_LOGIN_RESELLER'] = ENABLE; 
     268$reg['Config']['PREVENT_EXTERNAL_LOGIN_CLIENT'] = ENABLE; 
    264269 
    265270// Automatic search for new version 
    266 $main_cfg['CHECK_FOR_UPDATES'] = ENABLE; 
    267  
    268 if(!$main_cfg['ISPCP_SUPPORT_SYSTEM_TARGET']) { 
    269         $main_cfg['ISPCP_SUPPORT_SYSTEM_TARGET'] = '_self'; 
     271$reg['Config']['CHECK_FOR_UPDATES'] = ENABLE; 
     272 
     273if(!$reg['Config']['ISPCP_SUPPORT_SYSTEM_TARGET']) { 
     274        $reg['Config']['ISPCP_SUPPORT_SYSTEM_TARGET'] = '_self'; 
    270275} 
    271276 
    … …  
    286291require_once(INCLUDEPATH . '/functions.ticket_system.php'); 
    287292 
    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 ); 
     293// Get and store our configuration parameter that are stored in the database 
     294$reg['Db_Config'] = Config::getInstance(Config::DB, Database::getRawInstance()); 
     295 
     296// Override all the default parameters with the parameters that are stored in 
     297// the database 
     298$reg['Config']->replace_with($reg['Db_Config']); 
    293299 
    294300// Compress/gzip Class 
    … …  
    297303// Check if server information is enabled 
    298304// Note: If we receive a xhr request, the value must be forced to FALSE 
    299 $showCompression = $main_cfg['SHOW_COMPRESSION_SIZE'] ? !is_xhr() : false; 
     305$showCompression = $reg['Config']['SHOW_COMPRESSION_SIZE'] ? !is_xhr() : false; 
    300306 
    301307// construct the object 
Note: See TracChangeset for help on using the changeset viewer.