Index: gui/admin/admin_add.php
===================================================================
--- gui/admin/admin_add.php (revision 2801)
+++ gui/admin/admin_add.php (working copy)
@@ -33,10 +33,10 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/admin_add.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/admin_add.tpl');
$tpl->define_dynamic('page_message', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -225,10 +225,10 @@
return false;
}
if (!chk_password($_POST['pass'])) {
- if (Config::get('PASSWD_STRONG')) {
- set_page_message(sprintf(tr('The password must be at least %s long and contain letters and numbers to be valid.'), Config::get('PASSWD_CHARS')));
+ if (Config::getInstance()->get('PASSWD_STRONG')) {
+ set_page_message(sprintf(tr('The password must be at least %s long and contain letters and numbers to be valid.'), Config::getInstance()->get('PASSWD_CHARS')));
} else {
- set_page_message(sprintf(tr('Password data is shorter than %s signs or includes not permitted signs!'), Config::get('PASSWD_CHARS')));
+ set_page_message(sprintf(tr('Password data is shorter than %s signs or includes not permitted signs!'), Config::getInstance()->get('PASSWD_CHARS')));
}
return false;
@@ -272,8 +272,8 @@
*
*/
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_users_manage.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_users_manage.tpl');
add_user($tpl, $sql);
@@ -314,7 +314,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/admin_edit.php
===================================================================
--- gui/admin/admin_edit.php (revision 2801)
+++ gui/admin/admin_edit.php (working copy)
@@ -41,11 +41,11 @@
}
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/admin_edit.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/admin_edit.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('hosting_plans', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -120,10 +120,10 @@
}
if (!chk_password($_POST['pass'])) {
- if (Config::get('PASSWD_STRONG')) {
- set_page_message(sprintf(tr('The password must be at least %s long and contain letters and numbers to be valid.'), Config::get('PASSWD_CHARS')));
+ if (Config::getInstance()->get('PASSWD_STRONG')) {
+ set_page_message(sprintf(tr('The password must be at least %s long and contain letters and numbers to be valid.'), Config::getInstance()->get('PASSWD_CHARS')));
} else {
- set_page_message(sprintf(tr('Password data is shorter than %s signs or includes not permitted signs!'), Config::get('PASSWD_CHARS')));
+ set_page_message(sprintf(tr('Password data is shorter than %s signs or includes not permitted signs!'), Config::getInstance()->get('PASSWD_CHARS')));
}
user_goto('admin_edit.php?edit_id=' . $edit_id);
@@ -271,8 +271,8 @@
user_goto('manage_users.php');
}
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_users_manage.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_users_manage.tpl');
update_data($sql);
@@ -343,7 +343,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/admin_log.php
===================================================================
--- gui/admin/admin_log.php (revision 2801)
+++ gui/admin/admin_log.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/admin_log.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/admin_log.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('log_row', 'page');
$tpl->define_dynamic('scroll_prev_gray', 'page');
@@ -42,7 +42,7 @@
$tpl->define_dynamic('scroll_next', 'page');
$tpl->define_dynamic('clear_log', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -159,7 +159,7 @@
$log_message = preg_replace($pattern, $replacement, $log_message);
}
- $date_formt = Config::get('DATE_FORMAT') . ' H:i';
+ $date_formt = Config::getInstance()->get('DATE_FORMAT') . ' H:i';
$tpl->assign(
array(
'MESSAGE' => html_entity_decode($log_message),
@@ -255,8 +255,8 @@
* static page messages.
*
*/
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_general_information.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_general_information.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_general_information.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_general_information.tpl');
clear_log();
@@ -282,7 +282,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/circular.php
===================================================================
--- gui/admin/circular.php (revision 2801)
+++ gui/admin/circular.php (working copy)
@@ -33,11 +33,11 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/circular.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/circular.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('hosting_plans', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -222,8 +222,8 @@
* static page messages.
*
*/
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_users_manage.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_users_manage.tpl');
$tpl->assign(
array(
@@ -252,7 +252,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/custom_menus.php
===================================================================
--- gui/admin/custom_menus.php (revision 2801)
+++ gui/admin/custom_menus.php (working copy)
@@ -277,7 +277,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/custom_menus.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/custom_menus.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('hosting_plans', 'page');
$tpl->define_dynamic('button_list', 'page');
@@ -285,7 +285,7 @@
$tpl->define_dynamic('add_button', 'page');
$tpl->define_dynamic('edit_button', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -295,8 +295,8 @@
'ISP_LOGO' => get_logo($_SESSION['user_id'])
)
);
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_settings.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_settings.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_settings.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_settings.tpl');
add_new_button($sql);
@@ -348,7 +348,7 @@
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/database_update.php
===================================================================
--- gui/admin/database_update.php (revision 2801)
+++ gui/admin/database_update.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/database_update.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/database_update.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('hosting_plans', 'page');
$tpl->define_dynamic('database_update_message', 'page');
@@ -42,7 +42,7 @@
$tpl->assign(
array(
'TR_ADMIN_ISPCP_UPDATES_PAGE_TITLE' => tr('ispCP - Virtual Hosting Control System'),
- 'THEME_COLOR_PATH' => "../themes/" . Config::get('USER_INITIAL_THEME'),
+ 'THEME_COLOR_PATH' => "../themes/" . Config::getInstance()->get('USER_INITIAL_THEME'),
'THEME_CHARSET' => tr('encoding'),
'ISP_LOGO' => get_logo($_SESSION['user_id'])
)
@@ -56,8 +56,8 @@
if (!empty($_POST['execute']) && $_POST['execute'])
$execute = true;
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_system_tools.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_system_tools.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_system_tools.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_system_tools.tpl');
gen_page_message($tpl);
$tpl->assign(
@@ -102,6 +102,6 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
Index: gui/admin/domain_details.php
===================================================================
--- gui/admin/domain_details.php (revision 2801)
+++ gui/admin/domain_details.php (working copy)
@@ -33,11 +33,11 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/domain_details.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/domain_details.tpl');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('custom_buttons', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -81,8 +81,8 @@
)
);
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_users_manage.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_users_manage.tpl');
gen_page_message($tpl);
// Get user id that comes for manage domain
@@ -97,7 +97,7 @@
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
@@ -139,14 +139,14 @@
// Get status name
$dstatus = $data['domain_status'];
- if ($dstatus == Config::get('ITEM_OK_STATUS')
- || $dstatus == Config::get('ITEM_DISABLED_STATUS')
- || $dstatus == Config::get('ITEM_DELETE_STATUS')
- || $dstatus == Config::get('ITEM_ADD_STATUS')
- || $dstatus == Config::get('ITEM_RESTORE_STATUS')
- || $dstatus == Config::get('ITEM_CHANGE_STATUS')
- || $dstatus == Config::get('ITEM_TOENABLE_STATUS')
- || $dstatus == Config::get('ITEM_TODISABLED_STATUS')) {
+ if ($dstatus == Config::getInstance()->get('ITEM_OK_STATUS')
+ || $dstatus == Config::getInstance()->get('ITEM_DISABLED_STATUS')
+ || $dstatus == Config::getInstance()->get('ITEM_DELETE_STATUS')
+ || $dstatus == Config::getInstance()->get('ITEM_ADD_STATUS')
+ || $dstatus == Config::getInstance()->get('ITEM_RESTORE_STATUS')
+ || $dstatus == Config::getInstance()->get('ITEM_CHANGE_STATUS')
+ || $dstatus == Config::getInstance()->get('ITEM_TOENABLE_STATUS')
+ || $dstatus == Config::getInstance()->get('ITEM_TODISABLED_STATUS')) {
$dstatus = translate_dmn_status($data['domain_status']);
} else {
$dstatus = "" . $data['domain_status'] . "";
@@ -223,7 +223,7 @@
FROM `mail_users`
WHERE `domain_id` = ?
AND `mail_type` NOT RLIKE '_catchall'";
- if (Config::get('COUNT_DEFAULT_EMAIL_ADDRESSES') == 0) {
+ if (Config::getInstance()->get('COUNT_DEFAULT_EMAIL_ADDRESSES') == 0) {
$query .= " AND `mail_acc` != 'abuse'
AND `mail_acc` != 'postmaster'
AND `mail_acc` != 'webmaster'";
Index: gui/admin/domain_edit.php
===================================================================
--- gui/admin/domain_edit.php (revision 2801)
+++ gui/admin/domain_edit.php (working copy)
@@ -33,13 +33,13 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/domain_edit.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/domain_edit.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('ip_entry', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
-if (Config::exists('HOSTING_PLANS_LEVEL') && strtolower(Config::get('HOSTING_PLANS_LEVEL')) !== 'admin') {
+if (Config::getInstance()->exists('HOSTING_PLANS_LEVEL') && strtolower(Config::getInstance()->get('HOSTING_PLANS_LEVEL')) !== 'admin') {
user_goto('manage_users.php');
}
@@ -90,8 +90,8 @@
)
);
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_users_manage.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_users_manage.tpl');
gen_page_message($tpl);
if (isset($_POST['uaction']) && ('sub_data' === $_POST['uaction'])) {
@@ -213,7 +213,7 @@
if ($domain_expires == 0) {
$domain_expires = tr('N/A');
} else {
- $date_formt = Config::get('DATE_FORMAT');
+ $date_formt = Config::getInstance()->get('DATE_FORMAT');
$domain_expires = date($date_formt, $domain_expires);
}
@@ -664,7 +664,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/domain_statistics.php
===================================================================
--- gui/admin/domain_statistics.php (revision 2801)
+++ gui/admin/domain_statistics.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/domain_statistics.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/domain_statistics.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('hosting_plans', 'page');
$tpl->define_dynamic('month_list', 'page');
@@ -41,7 +41,7 @@
$tpl->define_dynamic('traffic_table', 'page');
$tpl->define_dynamic('traffic_table_item', 'traffic_table');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -155,7 +155,7 @@
$pop_trf,
$smtp_trf) = get_domain_trafic($ftm, $ltm, $domain_id);
- $date_formt = Config::get('DATE_FORMAT');
+ $date_formt = Config::getInstance()->get('DATE_FORMAT');
if ($web_trf == 0 && $ftp_trf == 0 && $smtp_trf == 0 && $pop_trf == 0) {
$tpl->assign(
array(
@@ -216,8 +216,8 @@
*
*/
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_statistics.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_statistics.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_statistics.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_statistics.tpl');
$tpl->assign(
array(
@@ -245,7 +245,7 @@
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/domain_status_change.php
===================================================================
--- gui/admin/domain_status_change.php (revision 2801)
+++ gui/admin/domain_status_change.php (working copy)
@@ -55,10 +55,10 @@
$location = 'admin';
-if ($rs->fields['domain_status'] == Config::get('ITEM_OK_STATUS')) {
+if ($rs->fields['domain_status'] == Config::getInstance()->get('ITEM_OK_STATUS')) {
$action = "disable";
change_domain_status($sql, $domain_id, $rs->fields['domain_name'], $action, $location);
-} else if ($rs->fields['domain_status'] == Config::get('ITEM_DISABLED_STATUS')) {
+} else if ($rs->fields['domain_status'] == Config::getInstance()->get('ITEM_DISABLED_STATUS')) {
$action = "enable";
change_domain_status($sql, $domain_id, $rs->fields['domain_name'], $action, $location);
} else {
Index: gui/admin/hosting_plan.php
===================================================================
--- gui/admin/hosting_plan.php (revision 2801)
+++ gui/admin/hosting_plan.php (working copy)
@@ -33,12 +33,12 @@
check_login(__FILE__);
-if (strtolower(Config::get('HOSTING_PLANS_LEVEL')) != 'admin') {
+if (strtolower(Config::getInstance()->get('HOSTING_PLANS_LEVEL')) != 'admin') {
user_goto('index.php');
}
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/hosting_plan.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/hosting_plan.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('hosting_plans', 'page');
// Table with hosting plans
@@ -47,7 +47,7 @@
$tpl->define_dynamic('hp_delete', 'page');
$tpl->define_dynamic('hp_menu_add', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -64,8 +64,8 @@
*
*/
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_hosting_plan.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_hosting_plan.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_hosting_plan.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_hosting_plan.tpl');
gen_hp_table($tpl, $_SESSION['user_id']);
$tpl->assign(
@@ -163,7 +163,7 @@
)
);
- $coid = Config::exists('CUSTOM_ORDERPANEL_ID') ? Config::get('CUSTOM_ORDERPANEL_ID'): '';
+ $coid = Config::getInstance()->exists('CUSTOM_ORDERPANEL_ID') ? Config::getInstance()->get('CUSTOM_ORDERPANEL_ID'): '';
$i = 1;
while (($data = $rs->FetchRow())) {
@@ -190,7 +190,7 @@
} // End of gen_hp_table()
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/hosting_plan_add.php
===================================================================
--- gui/admin/hosting_plan_add.php (revision 2801)
+++ gui/admin/hosting_plan_add.php (working copy)
@@ -32,15 +32,15 @@
check_login(__FILE__);
-if (strtolower(Config::get('HOSTING_PLANS_LEVEL')) != 'admin') {
+if (strtolower(Config::getInstance()->get('HOSTING_PLANS_LEVEL')) != 'admin') {
user_goto('index.php');
}
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/hosting_plan_add.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/hosting_plan_add.tpl');
$tpl->define_dynamic('page_message', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -57,8 +57,8 @@
*
*/
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_hosting_plan.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_hosting_plan.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_hosting_plan.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_hosting_plan.tpl');
$tpl->assign(
array(
@@ -120,7 +120,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
// Function definitions
Index: gui/admin/hosting_plan_delete.php
===================================================================
--- gui/admin/hosting_plan_delete.php (revision 2801)
+++ gui/admin/hosting_plan_delete.php (working copy)
@@ -32,7 +32,7 @@
check_login(__FILE__);
-if (strtolower(Config::get('HOSTING_PLANS_LEVEL')) != 'admin') {
+if (strtolower(Config::getInstance()->get('HOSTING_PLANS_LEVEL')) != 'admin') {
user_goto('index.php');
}
Index: gui/admin/hosting_plan_edit.php
===================================================================
--- gui/admin/hosting_plan_edit.php (revision 2801)
+++ gui/admin/hosting_plan_edit.php (working copy)
@@ -32,7 +32,7 @@
check_login(__FILE__);
-if (strtolower(Config::get('HOSTING_PLANS_LEVEL')) != 'admin') {
+if (strtolower(Config::getInstance()->get('HOSTING_PLANS_LEVEL')) != 'admin') {
user_goto('index.php');
}
@@ -40,12 +40,12 @@
$tpl->define_dynamic(
'page',
- Config::get('ADMIN_TEMPLATE_PATH') . '/hosting_plan_edit.tpl'
+ Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/hosting_plan_edit.tpl'
);
$tpl->define_dynamic('page_message', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
/**
* static page messages.
@@ -56,12 +56,12 @@
// Show main menu
gen_admin_mainmenu(
$tpl,
- Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_hosting_plan.tpl'
+ Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_hosting_plan.tpl'
);
gen_admin_menu(
$tpl,
- Config::get('ADMIN_TEMPLATE_PATH') . '/menu_hosting_plan.tpl'
+ Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_hosting_plan.tpl'
);
$tpl->assign(
@@ -154,7 +154,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
Index: gui/admin/index.php
===================================================================
--- gui/admin/index.php (revision 2801)
+++ gui/admin/index.php (working copy)
@@ -30,12 +30,12 @@
require '../include/ispcp-lib.php';
-check_login(__FILE__, Config::get('PREVENT_EXTERNAL_LOGIN_ADMIN'));
+check_login(__FILE__, Config::getInstance()->get('PREVENT_EXTERNAL_LOGIN_ADMIN'));
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/index.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/index.tpl');
$tpl->define_dynamic('def_language', 'page');
$tpl->define_dynamic('def_layout', 'page');
$tpl->define_dynamic('no_messages', 'page');
@@ -100,7 +100,7 @@
$tpl->assign(array('DATABASE_UPDATE_MESSAGE' => ''));
}
- if (!Config::get('CHECK_FOR_UPDATES')) {
+ if (!Config::getInstance()->get('CHECK_FOR_UPDATES')) {
$tpl->assign(array('UPDATE' => tr('Update checking is disabled!')));
$tpl->parse('UPDATE_MESSAGE', 'update_message');
return false;
@@ -195,8 +195,8 @@
)
);
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_general_information.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_general_information.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_general_information.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_general_information.tpl');
get_admin_general_info($tpl, $sql);
@@ -211,7 +211,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/ip_delete.php
===================================================================
--- gui/admin/ip_delete.php (revision 2801)
+++ gui/admin/ip_delete.php (working copy)
@@ -102,7 +102,7 @@
`ip_id` = ?
LIMIT 1
";
-$rs = exec_query($sql, $query, array(Config::get('ITEM_DELETE_STATUS'), $delete_id));
+$rs = exec_query($sql, $query, array(Config::getInstance()->get('ITEM_DELETE_STATUS'), $delete_id));
send_request();
Index: gui/admin/ip_manage.php
===================================================================
--- gui/admin/ip_manage.php (revision 2801)
+++ gui/admin/ip_manage.php (working copy)
@@ -36,7 +36,7 @@
$interfaces=new networkCard();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/ip_manage.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/ip_manage.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('hosting_plans', 'page');
$tpl->define_dynamic('ip_row', 'page');
@@ -44,7 +44,7 @@
$tpl->define_dynamic('ip_delete_show', 'ip_row');
$tpl->define_dynamic('ip_delete_link', 'ip_row');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -56,7 +56,7 @@
);
function gen_ip_action($ip_id, $status) {
- if ($status === Config::get('ITEM_OK_STATUS')) {
+ if ($status === Config::getInstance()->get('ITEM_OK_STATUS')) {
return array(tr('Remove IP'), 'ip_delete.php?delete_id=' . $ip_id);
} else {
return array(tr('N/A'), '#');
@@ -105,8 +105,8 @@
$tpl->assign(
array(
'IP_DELETE_SHOW' => '',
- 'IP_ACTION' => (Config::get('BASE_SERVER_IP') == $rs->fields['ip_number']) ? tr('N/A') : $ip_action,
- 'IP_ACTION_SCRIPT' => (Config::get('BASE_SERVER_IP') == $rs->fields['ip_number']) ? '#' : $ip_action_script
+ 'IP_ACTION' => (Config::getInstance()->get('BASE_SERVER_IP') == $rs->fields['ip_number']) ? tr('N/A') : $ip_action,
+ 'IP_ACTION_SCRIPT' => (Config::getInstance()->get('BASE_SERVER_IP') == $rs->fields['ip_number']) ? '#' : $ip_action_script
)
);
$tpl->parse('IP_DELETE_LINK', 'ip_delete_link');
@@ -132,7 +132,7 @@
(?, ?, ?, ?, ?, ?)
";
$rs = exec_query($sql, $query, array($ip_number, htmlspecialchars($domain, ENT_QUOTES, "UTF-8"),
- htmlspecialchars($alias, ENT_QUOTES, "UTF-8"), htmlspecialchars($ip_card, ENT_QUOTES, "UTF-8"), NULL, Config::get('ITEM_ADD_STATUS')));
+ htmlspecialchars($alias, ENT_QUOTES, "UTF-8"), htmlspecialchars($ip_card, ENT_QUOTES, "UTF-8"), NULL, Config::getInstance()->get('ITEM_ADD_STATUS')));
send_request();
@@ -255,8 +255,8 @@
* static page messages.
*
*/
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_settings.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_settings.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_settings.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_settings.tpl');
show_Network_Cards($tpl, $interfaces);
@@ -284,7 +284,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/ispcp_debugger.php
===================================================================
--- gui/admin/ispcp_debugger.php (revision 2801)
+++ gui/admin/ispcp_debugger.php (working copy)
@@ -34,20 +34,20 @@
function count_requests(&$sql, $id_name, $table) {
$query = "SELECT `$id_name` FROM `$table` WHERE `$id_name` NOT IN (?, ?, ?)";
- $rs = exec_query($sql, $query, array(Config::get('ITEM_OK_STATUS'), Config::get('ITEM_DISABLED_STATUS'), Config::get('ITEM_ORDERED_STATUS')));
+ $rs = exec_query($sql, $query, array(Config::getInstance()->get('ITEM_OK_STATUS'), Config::getInstance()->get('ITEM_DISABLED_STATUS'), Config::getInstance()->get('ITEM_ORDERED_STATUS')));
$count = $rs->RecordCount();
return $count;
}
function get_error_domains(&$sql, &$tpl) {
- $ok_status = Config::get('ITEM_OK_STATUS');
- $disabled_status = Config::get('ITEM_DISABLED_STATUS');
- $delete_status = Config::get('ITEM_DELETE_STATUS');
- $add_status = Config::get('ITEM_ADD_STATUS');
- $restore_status = Config::get('ITEM_RESTORE_STATUS');
- $change_status = Config::get('ITEM_CHANGE_STATUS');
- $toenable_status = Config::get('ITEM_TOENABLE_STATUS');
- $todisable_status = Config::get('ITEM_TODISABLED_STATUS');
+ $ok_status = Config::getInstance()->get('ITEM_OK_STATUS');
+ $disabled_status = Config::getInstance()->get('ITEM_DISABLED_STATUS');
+ $delete_status = Config::getInstance()->get('ITEM_DELETE_STATUS');
+ $add_status = Config::getInstance()->get('ITEM_ADD_STATUS');
+ $restore_status = Config::getInstance()->get('ITEM_RESTORE_STATUS');
+ $change_status = Config::getInstance()->get('ITEM_CHANGE_STATUS');
+ $toenable_status = Config::getInstance()->get('ITEM_TOENABLE_STATUS');
+ $todisable_status = Config::getInstance()->get('ITEM_TODISABLED_STATUS');
$dmn_query = "SELECT `domain_name`, `domain_status`, `domain_id` FROM `domain` WHERE `domain_status` NOT IN (?, ?, ?, ?, ?, ?, ?, ?)";
@@ -87,15 +87,15 @@
}
function get_error_aliases(&$sql, &$tpl) {
- $ok_status = Config::get('ITEM_OK_STATUS');
- $disabled_status = Config::get('ITEM_DISABLED_STATUS');
- $delete_status = Config::get('ITEM_DELETE_STATUS');
- $add_status = Config::get('ITEM_ADD_STATUS');
- $restore_status = Config::get('ITEM_RESTORE_STATUS');
- $change_status = Config::get('ITEM_CHANGE_STATUS');
- $toenable_status = Config::get('ITEM_TOENABLE_STATUS');
- $todisable_status = Config::get('ITEM_TODISABLED_STATUS');
- $ordered_status = Config::get('ITEM_ORDERED_STATUS');
+ $ok_status = Config::getInstance()->get('ITEM_OK_STATUS');
+ $disabled_status = Config::getInstance()->get('ITEM_DISABLED_STATUS');
+ $delete_status = Config::getInstance()->get('ITEM_DELETE_STATUS');
+ $add_status = Config::getInstance()->get('ITEM_ADD_STATUS');
+ $restore_status = Config::getInstance()->get('ITEM_RESTORE_STATUS');
+ $change_status = Config::getInstance()->get('ITEM_CHANGE_STATUS');
+ $toenable_status = Config::getInstance()->get('ITEM_TOENABLE_STATUS');
+ $todisable_status = Config::getInstance()->get('ITEM_TODISABLED_STATUS');
+ $ordered_status = Config::getInstance()->get('ITEM_ORDERED_STATUS');
$dmn_query = <<get('ITEM_OK_STATUS');
+ $disabled_status = Config::getInstance()->get('ITEM_DISABLED_STATUS');
+ $delete_status = Config::getInstance()->get('ITEM_DELETE_STATUS');
+ $add_status = Config::getInstance()->get('ITEM_ADD_STATUS');
+ $restore_status = Config::getInstance()->get('ITEM_RESTORE_STATUS');
+ $change_status = Config::getInstance()->get('ITEM_CHANGE_STATUS');
+ $toenable_status = Config::getInstance()->get('ITEM_TOENABLE_STATUS');
+ $todisable_status = Config::getInstance()->get('ITEM_TODISABLED_STATUS');
$dmn_query = <<get('ITEM_OK_STATUS');
+ $disabled_status = Config::getInstance()->get('ITEM_DISABLED_STATUS');
+ $delete_status = Config::getInstance()->get('ITEM_DELETE_STATUS');
+ $add_status = Config::getInstance()->get('ITEM_ADD_STATUS');
+ $restore_status = Config::getInstance()->get('ITEM_RESTORE_STATUS');
+ $change_status = Config::getInstance()->get('ITEM_CHANGE_STATUS');
+ $toenable_status = Config::getInstance()->get('ITEM_TOENABLE_STATUS');
+ $todisable_status = Config::getInstance()->get('ITEM_TODISABLED_STATUS');
$dmn_query = <<get('ITEM_OK_STATUS');
+ $disabled_status = Config::getInstance()->get('ITEM_DISABLED_STATUS');
+ $delete_status = Config::getInstance()->get('ITEM_DELETE_STATUS');
+ $add_status = Config::getInstance()->get('ITEM_ADD_STATUS');
+ $restore_status = Config::getInstance()->get('ITEM_RESTORE_STATUS');
+ $change_status = Config::getInstance()->get('ITEM_CHANGE_STATUS');
+ $toenable_status = Config::getInstance()->get('ITEM_TOENABLE_STATUS');
+ $todisable_status = Config::getInstance()->get('ITEM_TODISABLED_STATUS');
+ $ordered_status = Config::getInstance()->get('ITEM_ORDERED_STATUS');
$dmn_query = <<define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/ispcp_debugger.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/ispcp_debugger.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('hosting_plans', 'page');
$tpl->define_dynamic('domain_message', 'page');
@@ -406,7 +406,7 @@
$tpl->define_dynamic('subdomain_alias_list', 'page');
$tpl->define_dynamic('mail_list', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -422,8 +422,8 @@
* static page messages.
*
*/
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_system_tools.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_system_tools.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_system_tools.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_system_tools.tpl');
$tpl->assign(
array(
@@ -496,7 +496,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/ispcp_updates.php
===================================================================
--- gui/admin/ispcp_updates.php (revision 2801)
+++ gui/admin/ispcp_updates.php (working copy)
@@ -32,10 +32,10 @@
check_login(__FILE__);
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/ispcp_updates.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/ispcp_updates.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('hosting_plans', 'page');
$tpl->define_dynamic('update_message', 'page');
@@ -53,7 +53,7 @@
/* BEGIN common functions */
function get_update_infos(&$tpl) {
- if (!Config::get('CHECK_FOR_UPDATES')) {
+ if (!Config::getInstance()->get('CHECK_FOR_UPDATES')) {
$tpl->assign(
array(
'UPDATE_MESSAGE' => '',
@@ -90,8 +90,8 @@
*
*/
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_system_tools.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_system_tools.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_system_tools.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_system_tools.tpl');
$tpl->assign(
array(
@@ -110,7 +110,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/language.php
===================================================================
--- gui/admin/language.php (revision 2801)
+++ gui/admin/language.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/language.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/language.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('def_language', 'page');
$tpl->define_dynamic('logged_from', 'page');
@@ -64,7 +64,7 @@
set_page_message(tr('User language updated successfully!'));
}
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
if (!isset($_SESSION['logged_from']) && !isset($_SESSION['logged_from_id'])) {
@@ -92,8 +92,8 @@
*
*/
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_general_information.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_general_information.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_general_information.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_general_information.tpl');
gen_logged_from($tpl);
@@ -113,7 +113,7 @@
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/language_delete.php
===================================================================
--- gui/admin/language_delete.php (revision 2801)
+++ gui/admin/language_delete.php (working copy)
@@ -40,7 +40,7 @@
$delete_lang = $_GET['delete_lang'];
/* ERROR - we have domains that use this IP */
-if ($delete_lang == Config::get('USER_INITIAL_LANG')) {
+if ($delete_lang == Config::getInstance()->get('USER_INITIAL_LANG')) {
set_page_message('Error we can\'t delete system default language!');
user_goto('multilanguage.php');
Index: gui/admin/manage_reseller_owners.php
===================================================================
--- gui/admin/manage_reseller_owners.php (revision 2801)
+++ gui/admin/manage_reseller_owners.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/manage_reseller_owners.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/manage_reseller_owners.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('hosting_plans', 'page');
$tpl->define_dynamic('reseller_list', 'page');
@@ -41,7 +41,7 @@
$tpl->define_dynamic('select_admin', 'page');
$tpl->define_dynamic('select_admin_option', 'select_admin');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
/**
* @todo check if it's useful to have the table admin two times in the same query
@@ -207,8 +207,8 @@
)
);
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_users_manage.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_users_manage.tpl');
update_reseller_owner($sql);
@@ -230,7 +230,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/manage_reseller_users.php
===================================================================
--- gui/admin/manage_reseller_users.php (revision 2801)
+++ gui/admin/manage_reseller_users.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/manage_reseller_users.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/manage_reseller_users.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('hosting_plans', 'page');
$tpl->define_dynamic('reseller_list', 'page');
@@ -43,7 +43,7 @@
$tpl->define_dynamic('dst_reseller', 'page');
$tpl->define_dynamic('dst_reseller_option', 'dst_reseller');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
function gen_user_table(&$tpl, &$sql) {
$query = <<get('ADMIN_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_users_manage.tpl');
update_reseller_user($sql);
@@ -484,7 +484,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/manage_users.php
===================================================================
--- gui/admin/manage_users.php (revision 2801)
+++ gui/admin/manage_users.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/manage_users.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/manage_users.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('admin_message', 'page');
$tpl->define_dynamic('admin_list', 'page');
@@ -57,7 +57,7 @@
$tpl->define_dynamic('scroll_next_gray', 'page');
$tpl->define_dynamic('scroll_next', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -112,13 +112,13 @@
*
*/
-if (!Config::exists('HOSTING_PLANS_LEVEL')
- || strtolower(Config::get('HOSTING_PLANS_LEVEL')) !== 'admin') {
+if (!Config::getInstance()->exists('HOSTING_PLANS_LEVEL')
+ || strtolower(Config::getInstance()->get('HOSTING_PLANS_LEVEL')) !== 'admin') {
$tpl->assign('EDIT_OPTION', '');
}
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_users_manage.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_users_manage.tpl');
get_admin_manage_users($tpl, $sql);
@@ -127,7 +127,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/multilanguage.php
===================================================================
--- gui/admin/multilanguage.php (revision 2801)
+++ gui/admin/multilanguage.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/multilanguage.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/multilanguage.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('lang_row', 'page');
$tpl->define_dynamic('lang_delete_link', 'lang_row');
@@ -41,7 +41,7 @@
$tpl->define_dynamic('lang_radio', 'lang_row');
$tpl->define_dynamic('lang_def', 'lang_row');
-$theme = Config::get('USER_INITIAL_THEME');
+$theme = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -210,7 +210,7 @@
$tpl->assign('LANG_CLASS', ($row++ % 2 == 0) ? 'content2' : 'content');
- if (Config::get('USER_INITIAL_LANG') == 'lang_' . $dat[1]
+ if (Config::getInstance()->get('USER_INITIAL_LANG') == 'lang_' . $dat[1]
|| $usr_def_lng[1] == $dat[1]) {
$tpl->assign(
array(
@@ -252,8 +252,8 @@
*
*/
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_settings.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_settings.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_settings.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_settings.tpl');
install_lang();
@@ -283,7 +283,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/password_change.php
===================================================================
--- gui/admin/password_change.php (revision 2801)
+++ gui/admin/password_change.php (working copy)
@@ -33,11 +33,11 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/password_change.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/password_change.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('hosting_plans', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -55,10 +55,10 @@
if (empty($_POST['pass']) || empty($_POST['pass_rep']) || empty($_POST['curr_pass'])) {
set_page_message(tr('Please fill up all data fields!'));
} else if (!chk_password($_POST['pass'])) {
- if (Config::get('PASSWD_STRONG')) {
- set_page_message(sprintf(tr('The password must be at least %s long and contain letters and numbers to be valid.'), Config::get('PASSWD_CHARS')));
+ if (Config::getInstance()->get('PASSWD_STRONG')) {
+ set_page_message(sprintf(tr('The password must be at least %s long and contain letters and numbers to be valid.'), Config::getInstance()->get('PASSWD_CHARS')));
} else {
- set_page_message(sprintf(tr('Password data is shorter than %s signs or includes not permitted signs!'), Config::get('PASSWD_CHARS')));
+ set_page_message(sprintf(tr('Password data is shorter than %s signs or includes not permitted signs!'), Config::getInstance()->get('PASSWD_CHARS')));
}
} else if ($_POST['pass'] !== $_POST['pass_rep']) {
set_page_message(tr('Passwords do not match!'));
@@ -117,8 +117,8 @@
* static page messages.
*
*/
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_general_information.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_general_information.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_general_information.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_general_information.tpl');
$tpl->assign(
array(
@@ -141,7 +141,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/personal_change.php
===================================================================
--- gui/admin/personal_change.php (revision 2801)
+++ gui/admin/personal_change.php (working copy)
@@ -33,11 +33,11 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/personal_change.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/personal_change.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('hosting_plans', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -158,8 +158,8 @@
* static page messages.
*
*/
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_general_information.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_general_information.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_general_information.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_general_information.tpl');
$tpl->assign(
array(
@@ -190,7 +190,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/reseller_add.php
===================================================================
--- gui/admin/reseller_add.php (revision 2801)
+++ gui/admin/reseller_add.php (working copy)
@@ -34,14 +34,14 @@
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/reseller_add.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/reseller_add.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('hosting_plans', 'page');
$tpl->define_dynamic('rsl_ip_message', 'page');
$tpl->define_dynamic('rsl_ip_list', 'page');
$tpl->define_dynamic('rsl_ip_item', 'rsl_ip_list');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -415,10 +415,10 @@
return false;
}
if (!chk_password($_POST['pass'])) {
- if (Config::get('PASSWD_STRONG')) {
- set_page_message(sprintf(tr('The password must be at least %s long and contain letters and numbers to be valid.'), Config::get('PASSWD_CHARS')));
+ if (Config::getInstance()->get('PASSWD_STRONG')) {
+ set_page_message(sprintf(tr('The password must be at least %s long and contain letters and numbers to be valid.'), Config::getInstance()->get('PASSWD_CHARS')));
} else {
- set_page_message(sprintf(tr('Password data is shorter than %s signs or includes not permitted signs!'), Config::get('PASSWD_CHARS')));
+ set_page_message(sprintf(tr('Password data is shorter than %s signs or includes not permitted signs!'), Config::getInstance()->get('PASSWD_CHARS')));
}
return false;
@@ -502,8 +502,8 @@
* static page messages.
*
*/
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_users_manage.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_users_manage.tpl');
$reseller_ips = get_server_ip($tpl, $sql);
@@ -574,7 +574,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/reseller_edit.php
===================================================================
--- gui/admin/reseller_edit.php (revision 2801)
+++ gui/admin/reseller_edit.php (working copy)
@@ -107,17 +107,17 @@
if (!chk_password($_POST['pass0'])) {
- if (Config::get('PASSWD_STRONG')) {
+ if (Config::getInstance()->get('PASSWD_STRONG')) {
set_page_message(
sprintf(
- tr('The password must be at least %s long and contain letters and numbers to be valid.'),Config::get('PASSWD_CHARS'))
+ tr('The password must be at least %s long and contain letters and numbers to be valid.'),Config::getInstance()->get('PASSWD_CHARS'))
);
} else {
set_page_message(
sprintf(
- tr('Password data is shorter than %s signs or includes not permitted signs!'),Config::get('PASSWD_CHARS'))
+ tr('Password data is shorter than %s signs or includes not permitted signs!'),Config::getInstance()->get('PASSWD_CHARS'))
);
}
@@ -834,14 +834,14 @@
}
$tpl = new pTemplate();
- $tpl->define_dynamic('page',Config::get('ADMIN_TEMPLATE_PATH') .'/reseller_edit.tpl');
+ $tpl->define_dynamic('page',Config::getInstance()->get('ADMIN_TEMPLATE_PATH') .'/reseller_edit.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('hosting_plans', 'page');
$tpl->define_dynamic('rsl_ip_message', 'page');
$tpl->define_dynamic('rsl_ip_list', 'page');
$tpl->define_dynamic('rsl_ip_item', 'rsl_ip_list');
- $theme_color = Config::get('USER_INITIAL_THEME');
+ $theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -853,8 +853,8 @@
)
);
- gen_admin_mainmenu($tpl,Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
- gen_admin_menu($tpl,Config::get('ADMIN_TEMPLATE_PATH') . '/menu_users_manage.tpl');
+ gen_admin_mainmenu($tpl,Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
+ gen_admin_menu($tpl,Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_users_manage.tpl');
// First, we get needed data
$rdata =& get_data($tpl);
@@ -1057,7 +1057,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
Index: gui/admin/reseller_statistics.php
===================================================================
--- gui/admin/reseller_statistics.php (revision 2801)
+++ gui/admin/reseller_statistics.php (working copy)
@@ -34,7 +34,7 @@
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/reseller_statistics.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->getInstance()->get('ADMIN_TEMPLATE_PATH') . '/reseller_statistics.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('hosting_plans', 'page');
$tpl->define_dynamic('traffic_table', 'page');
@@ -46,7 +46,7 @@
$tpl->define_dynamic('scroll_next_gray', 'page');
$tpl->define_dynamic('scroll_next', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -76,7 +76,7 @@
$start_index = 0;
- $rows_per_page = Config::get('DOMAIN_ROWS_PER_PAGE');
+ $rows_per_page = Config::getInstance()->getInstance()->get('DOMAIN_ROWS_PER_PAGE');
if (isset($_GET['psi']) && is_numeric($_GET['psi'])) {
$start_index = $_GET['psi'];
@@ -299,8 +299,8 @@
$crnt_month = '';
$crnt_year = '';
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_statistics.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_statistics.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_statistics.tpl');
+gen_admin_menu($tpl, Config::getInstance()->getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_statistics.tpl');
generate_page ($tpl);
@@ -328,7 +328,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/reseller_user_statistics.php
===================================================================
--- gui/admin/reseller_user_statistics.php (revision 2801)
+++ gui/admin/reseller_user_statistics.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/reseller_user_statistics.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/reseller_user_statistics.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('hosting_plans', 'page');
$tpl->define_dynamic('page_message', 'page');
@@ -48,7 +48,7 @@
$tpl->define_dynamic('scroll_next_gray', 'page');
$tpl->define_dynamic('scroll_next', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
if (isset($_POST['rid']) && isset($_POST['name'])) {
$rid = $_POST['rid'];
@@ -88,7 +88,7 @@
$start_index = 0;
- $rows_per_page = Config::get('DOMAIN_ROWS_PER_PAGE');
+ $rows_per_page = Config::getInstance()->get('DOMAIN_ROWS_PER_PAGE');
if (isset($_GET['psi'])) {
$start_index = $_GET['psi'];
@@ -340,8 +340,8 @@
* static page messages.
*
*/
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_statistics.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_statistics.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_statistics.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_statistics.tpl');
$tpl->assign(
array(
@@ -377,7 +377,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/rootkit_log.php
===================================================================
--- gui/admin/rootkit_log.php (revision 2801)
+++ gui/admin/rootkit_log.php (working copy)
@@ -33,12 +33,12 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/rootkit_log.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/rootkit_log.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('service_status', 'page');
$tpl->define_dynamic('props_list', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -56,11 +56,11 @@
$config_entries = array('RKHUNTER_LOG', 'CHKROOTKIT_LOG', 'OTHER_ROOTKIT_LOG');
foreach ($config_entries as $config_entry) {
- if (empty($config_entry) || !Config::exists($config_entry) || !Config::get($config_entry)) {
+ if (empty($config_entry) || !Config::getInstance()->exists($config_entry) || !Config::getInstance()->get($config_entry)) {
continue;
}
- $filename = Config::get($config_entry);
+ $filename = Config::getInstance()->get($config_entry);
$contents = '';
if (@file_exists($filename) && is_readable($filename) && filesize($filename)>0) {
@@ -136,8 +136,8 @@
* static page messages.
*
*/
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_system_tools.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_system_tools.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_system_tools.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_system_tools.tpl');
$tpl->assign(
array(
@@ -150,7 +150,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/server_statistic.php
===================================================================
--- gui/admin/server_statistic.php (revision 2801)
+++ gui/admin/server_statistic.php (working copy)
@@ -33,14 +33,14 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/server_statistic.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/server_statistic.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('hosting_plans', 'page');
$tpl->define_dynamic('month_list', 'page');
$tpl->define_dynamic('year_list', 'page');
$tpl->define_dynamic('day_list', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -211,8 +211,8 @@
* static page messages.
*
*/
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_statistics.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_statistics.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_statistics.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_statistics.tpl');
gen_select_lists($tpl, $month, $year);
@@ -244,7 +244,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/server_statistic_day.php
===================================================================
--- gui/admin/server_statistic_day.php (revision 2801)
+++ gui/admin/server_statistic_day.php (working copy)
@@ -33,11 +33,11 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/server_statistic_day.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/server_statistic_day.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('hour_list', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -190,8 +190,8 @@
* static page messages.
*
*/
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_statistics.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_statistics.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_statistics.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_statistics.tpl');
$tpl->assign(
array(
@@ -225,7 +225,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/server_status.php
===================================================================
--- gui/admin/server_status.php (revision 2801)
+++ gui/admin/server_status.php (working copy)
@@ -33,11 +33,11 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/server_status.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/server_status.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('service_status', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -175,7 +175,7 @@
: $rs->fields['value'];
list($port, $protocol, $name, $status, $custom, $ip) = explode(";", $value);
if ($status) {
- $ispcp_status->AddService(($ip == '127.0.0.1' ? 'localhost' : (empty($ip) ? Config::get('BASE_SERVER_IP') : $ip)), (int)$port, $name, $protocol);
+ $ispcp_status->AddService(($ip == '127.0.0.1' ? 'localhost' : (empty($ip) ? Config::getInstance()->get('BASE_SERVER_IP') : $ip)), (int)$port, $name, $protocol);
}
$rs->MoveNext();
@@ -224,8 +224,8 @@
* static page messages.
*
*/
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_general_information.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_general_information.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_general_information.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_general_information.tpl');
$tpl->assign(
array(
@@ -243,7 +243,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/sessions_manage.php
===================================================================
--- gui/admin/sessions_manage.php (revision 2801)
+++ gui/admin/sessions_manage.php (working copy)
@@ -33,12 +33,12 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/sessions_manage.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/sessions_manage.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('hosting_plans', 'page');
$tpl->define_dynamic('user_session', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -119,8 +119,8 @@
* static page messages.
*
*/
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_users_manage.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_users_manage.tpl');
kill_session($sql);
@@ -143,7 +143,7 @@
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/settings.php
===================================================================
--- gui/admin/settings.php (revision 2801)
+++ gui/admin/settings.php (working copy)
@@ -33,10 +33,10 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/settings.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/settings.tpl');
$tpl->define_dynamic('def_language', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -140,27 +140,27 @@
}
}
-$coid = Config::exists('CUSTOM_ORDERPANEL_ID') ? Config::get('CUSTOM_ORDERPANEL_ID'): '';
+$coid = Config::getInstance()->exists('CUSTOM_ORDERPANEL_ID') ? Config::getInstance()->get('CUSTOM_ORDERPANEL_ID'): '';
$tpl->assign(
array(
- 'LOSTPASSWORD_TIMEOUT_VALUE' => Config::get('LOSTPASSWORD_TIMEOUT'),
- 'PASSWD_CHARS' => Config::get('PASSWD_CHARS'),
- 'BRUTEFORCE_MAX_LOGIN_VALUE' => Config::get('BRUTEFORCE_MAX_LOGIN'),
- 'BRUTEFORCE_BLOCK_TIME_VALUE' => Config::get('BRUTEFORCE_BLOCK_TIME'),
- 'BRUTEFORCE_BETWEEN_TIME_VALUE' => Config::get('BRUTEFORCE_BETWEEN_TIME'),
- 'BRUTEFORCE_MAX_CAPTCHA' => Config::get('BRUTEFORCE_MAX_CAPTCHA'),
- 'DOMAIN_ROWS_PER_PAGE' => Config::get('DOMAIN_ROWS_PER_PAGE'),
+ 'LOSTPASSWORD_TIMEOUT_VALUE' => Config::getInstance()->get('LOSTPASSWORD_TIMEOUT'),
+ 'PASSWD_CHARS' => Config::getInstance()->get('PASSWD_CHARS'),
+ 'BRUTEFORCE_MAX_LOGIN_VALUE' => Config::getInstance()->get('BRUTEFORCE_MAX_LOGIN'),
+ 'BRUTEFORCE_BLOCK_TIME_VALUE' => Config::getInstance()->get('BRUTEFORCE_BLOCK_TIME'),
+ 'BRUTEFORCE_BETWEEN_TIME_VALUE' => Config::getInstance()->get('BRUTEFORCE_BETWEEN_TIME'),
+ 'BRUTEFORCE_MAX_CAPTCHA' => Config::getInstance()->get('BRUTEFORCE_MAX_CAPTCHA'),
+ 'DOMAIN_ROWS_PER_PAGE' => Config::getInstance()->get('DOMAIN_ROWS_PER_PAGE'),
'CUSTOM_ORDERPANEL_ID' => $coid,
- 'MAX_DNAMES_LABELS_VALUE' => Config::get('MAX_DNAMES_LABELS'),
- 'MAX_SUBDNAMES_LABELS_VALUE' => Config::get('MAX_SUBDNAMES_LABELS')
+ 'MAX_DNAMES_LABELS_VALUE' => Config::getInstance()->get('MAX_DNAMES_LABELS'),
+ 'MAX_SUBDNAMES_LABELS_VALUE' => Config::getInstance()->get('MAX_SUBDNAMES_LABELS')
)
);
-$language = Config::get('USER_INITIAL_LANG');
+$language = Config::getInstance()->get('USER_INITIAL_LANG');
gen_def_language($tpl, $sql, $language);
-if (Config::get('LOSTPASSWORD')) {
+if (Config::getInstance()->get('LOSTPASSWORD')) {
$tpl->assign('LOSTPASSWORD_SELECTED_ON', 'selected="selected"');
$tpl->assign('LOSTPASSWORD_SELECTED_OFF', '');
} else {
@@ -168,7 +168,7 @@
$tpl->assign('LOSTPASSWORD_SELECTED_OFF', 'selected="selected"');
}
-if (Config::get('PASSWD_STRONG')) {
+if (Config::getInstance()->get('PASSWD_STRONG')) {
$tpl->assign('PASSWD_STRONG_ON', 'selected="selected"');
$tpl->assign('PASSWD_STRONG_OFF', '');
} else {
@@ -176,7 +176,7 @@
$tpl->assign('PASSWD_STRONG_OFF', 'selected="selected"');
}
-if (Config::get('BRUTEFORCE')) {
+if (Config::getInstance()->get('BRUTEFORCE')) {
$tpl->assign('BRUTEFORCE_SELECTED_ON', 'selected="selected"');
$tpl->assign('BRUTEFORCE_SELECTED_OFF', '');
} else {
@@ -184,7 +184,7 @@
$tpl->assign('BRUTEFORCE_SELECTED_OFF', 'selected="selected"');
}
-if (Config::get('BRUTEFORCE_BETWEEN')) {
+if (Config::getInstance()->get('BRUTEFORCE_BETWEEN')) {
$tpl->assign('BRUTEFORCE_BETWEEN_SELECTED_ON', 'selected="selected"');
$tpl->assign('BRUTEFORCE_BETWEEN_SELECTED_OFF', '');
} else {
@@ -192,7 +192,7 @@
$tpl->assign('BRUTEFORCE_BETWEEN_SELECTED_OFF', 'selected="selected"');
}
-if (Config::get('ISPCP_SUPPORT_SYSTEM')) {
+if (Config::getInstance()->get('ISPCP_SUPPORT_SYSTEM')) {
$tpl->assign('SUPPORT_SYSTEM_SELECTED_ON', 'selected="selected"');
$tpl->assign('SUPPORT_SYSTEM_SELECTED_OFF', '');
} else {
@@ -200,7 +200,7 @@
$tpl->assign('SUPPORT_SYSTEM_SELECTED_OFF', 'selected="selected"');
}
-if (Config::get('TLD_STRICT_VALIDATION')) {
+if (Config::getInstance()->get('TLD_STRICT_VALIDATION')) {
$tpl->assign('TLD_STRICT_VALIDATION_ON', 'selected="selected"');
$tpl->assign('TLD_STRICT_VALIDATION_OFF', '');
} else {
@@ -208,7 +208,7 @@
$tpl->assign('TLD_STRICT_VALIDATION_OFF', 'selected="selected"');
}
-if (Config::get('SLD_STRICT_VALIDATION')) {
+if (Config::getInstance()->get('SLD_STRICT_VALIDATION')) {
$tpl->assign('SLD_STRICT_VALIDATION_ON', 'selected="selected"');
$tpl->assign('SLD_STRICT_VALIDATION_OFF', '');
} else {
@@ -216,7 +216,7 @@
$tpl->assign('SLD_STRICT_VALIDATION_OFF', 'selected="selected"');
}
-if (Config::get('CREATE_DEFAULT_EMAIL_ADDRESSES')) {
+if (Config::getInstance()->get('CREATE_DEFAULT_EMAIL_ADDRESSES')) {
$tpl->assign('CREATE_DEFAULT_EMAIL_ADDRESSES_ON', 'selected="selected"');
$tpl->assign('CREATE_DEFAULT_EMAIL_ADDRESSES_OFF', '');
} else {
@@ -224,7 +224,7 @@
$tpl->assign('CREATE_DEFAULT_EMAIL_ADDRESSES_OFF', 'selected="selected"');
}
-if (Config::get('COUNT_DEFAULT_EMAIL_ADDRESSES')) {
+if (Config::getInstance()->get('COUNT_DEFAULT_EMAIL_ADDRESSES')) {
$tpl->assign('COUNT_DEFAULT_EMAIL_ADDRESSES_ON', 'selected="selected"');
$tpl->assign('COUNT_DEFAULT_EMAIL_ADDRESSES_OFF', '');
} else {
@@ -232,7 +232,7 @@
$tpl->assign('COUNT_DEFAULT_EMAIL_ADDRESSES_OFF', 'selected="selected"');
}
-if (Config::get('HARD_MAIL_SUSPENSION')) {
+if (Config::getInstance()->get('HARD_MAIL_SUSPENSION')) {
$tpl->assign('HARD_MAIL_SUSPENSION_ON', 'selected="selected"');
$tpl->assign('HARD_MAIL_SUSPENSION_OFF', '');
} else {
@@ -240,7 +240,7 @@
$tpl->assign('HARD_MAIL_SUSPENSION_OFF', 'selected="selected"');
}
-if (Config::get('HOSTING_PLANS_LEVEL') == "admin") {
+if (Config::getInstance()->get('HOSTING_PLANS_LEVEL') == "admin") {
$tpl->assign('HOSTING_PLANS_LEVEL_ADMIN', 'selected="selected"');
$tpl->assign('HOSTING_PLANS_LEVEL_RESELLER', '');
} else {
@@ -248,7 +248,7 @@
$tpl->assign('HOSTING_PLANS_LEVEL_RESELLER', 'selected="selected"');
}
-if (Config::get('CHECK_FOR_UPDATES')) {
+if (Config::getInstance()->get('CHECK_FOR_UPDATES')) {
$tpl->assign('CHECK_FOR_UPDATES_SELECTED_ON', 'selected="selected"');
$tpl->assign('CHECK_FOR_UPDATES_SELECTED_OFF', '');
} else {
@@ -256,7 +256,7 @@
$tpl->assign('CHECK_FOR_UPDATES_SELECTED_OFF', 'selected="selected"');
}
-if (Config::get('SHOW_SERVERLOAD')) {
+if (Config::getInstance()->get('SHOW_SERVERLOAD')) {
$tpl->assign('SHOW_SERVERLOAD_SELECTED_ON', 'selected="selected"');
$tpl->assign('SHOW_SERVERLOAD_SELECTED_OFF', '');
} else {
@@ -264,7 +264,7 @@
$tpl->assign('SHOW_SERVERLOAD_SELECTED_OFF', 'selected="selected"');
}
-if (Config::get('PREVENT_EXTERNAL_LOGIN_ADMIN')) {
+if (Config::getInstance()->get('PREVENT_EXTERNAL_LOGIN_ADMIN')) {
$tpl->assign('PREVENT_EXTERNAL_LOGIN_ADMIN_SELECTED_ON', 'selected="selected"');
$tpl->assign('PREVENT_EXTERNAL_LOGIN_ADMIN_SELECTED_OFF', '');
} else {
@@ -272,7 +272,7 @@
$tpl->assign('PREVENT_EXTERNAL_LOGIN_ADMIN_SELECTED_OFF', 'selected="selected"');
}
-if (Config::get('PREVENT_EXTERNAL_LOGIN_RESELLER')) {
+if (Config::getInstance()->get('PREVENT_EXTERNAL_LOGIN_RESELLER')) {
$tpl->assign('PREVENT_EXTERNAL_LOGIN_RESELLER_SELECTED_ON', 'selected="selected"');
$tpl->assign('PREVENT_EXTERNAL_LOGIN_RESELLER_SELECTED_OFF', '');
} else {
@@ -280,7 +280,7 @@
$tpl->assign('PREVENT_EXTERNAL_LOGIN_RESELLER_SELECTED_OFF', 'selected="selected"');
}
-if (Config::get('PREVENT_EXTERNAL_LOGIN_CLIENT')) {
+if (Config::getInstance()->get('PREVENT_EXTERNAL_LOGIN_CLIENT')) {
$tpl->assign('PREVENT_EXTERNAL_LOGIN_CLIENT_SELECTED_ON', 'selected="selected"');
$tpl->assign('PREVENT_EXTERNAL_LOGIN_CLIENT_SELECTED_OFF', '');
} else {
@@ -288,7 +288,7 @@
$tpl->assign('PREVENT_EXTERNAL_LOGIN_CLIENT_SELECTED_OFF', 'selected="selected"');
}
-switch (Config::get('LOG_LEVEL')) {
+switch (Config::getInstance()->get('LOG_LEVEL')) {
case E_USER_OFF:
$tpl->assign('LOG_LEVEL_SELECTED_OFF', 'selected="selected"');
$tpl->assign('LOG_LEVEL_SELECTED_NOTICE', '');
@@ -319,8 +319,8 @@
* static page messages.
*
*/
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_settings.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_settings.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_settings.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_settings.tpl');
$tpl->assign(
array(
@@ -379,7 +379,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/settings_layout.php
===================================================================
--- gui/admin/settings_layout.php (revision 2801)
+++ gui/admin/settings_layout.php (working copy)
@@ -136,7 +136,7 @@
}
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/settings_layout.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/settings_layout.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('hosting_plans', 'page');
$tpl->define_dynamic('def_layout', 'page');
@@ -146,11 +146,11 @@
update_logo();
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
gen_def_layout($tpl, $_SESSION['user_theme']);
-if(get_own_logo($_SESSION['user_id']) !== Config::get('IPS_LOGO_PATH').'/isp_logo.gif') {
+if(get_own_logo($_SESSION['user_id']) !== Config::getInstance()->get('IPS_LOGO_PATH').'/isp_logo.gif') {
$tpl->parse('LOGO_REMOVE_BUTTON', '.logo_remove_button');
} else {
$tpl->assign('LOGO_REMOVE_BUTTON', '');
@@ -172,8 +172,8 @@
*
*/
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_settings.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_settings.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_settings.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_settings.tpl');
$tpl->assign(
array(
@@ -198,7 +198,7 @@
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/settings_lostpassword.php
===================================================================
--- gui/admin/settings_lostpassword.php (revision 2801)
+++ gui/admin/settings_lostpassword.php (working copy)
@@ -33,12 +33,12 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/settings_lostpassword.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/settings_lostpassword.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('custom_buttons', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$user_id = $_SESSION['user_id'];
$selected_on = '';
@@ -87,8 +87,8 @@
)
);
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_settings.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_settings.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_settings.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_settings.tpl');
gen_logged_from($tpl);
@@ -124,7 +124,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/settings_maintenance_mode.php
===================================================================
--- gui/admin/settings_maintenance_mode.php (revision 2801)
+++ gui/admin/settings_maintenance_mode.php (working copy)
@@ -33,9 +33,9 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/settings_maintenance_mode.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/settings_maintenance_mode.tpl');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -60,7 +60,7 @@
set_page_message(tr('Settings saved !'));
}
-if (Config::get('MAINTENANCEMODE')) {
+if (Config::getInstance()->get('MAINTENANCEMODE')) {
$selected_on = 'selected="selected"';
} else {
$selected_off = 'selected="selected"';
@@ -71,15 +71,15 @@
* static page messages.
*
*/
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_system_tools.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_system_tools.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_system_tools.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_system_tools.tpl');
$tpl->assign(
array(
'TR_MAINTENANCEMODE' => tr('Maintenance mode'),
'TR_MESSAGE_TEMPLATE_INFO' => tr('Under this mode only administrators can login'),
'TR_MESSAGE' => tr('Message'),
- 'MESSAGE_VALUE' => Config::get('MAINTENANCEMODE_MESSAGE'),
+ 'MESSAGE_VALUE' => Config::getInstance()->get('MAINTENANCEMODE_MESSAGE'),
'SELECTED_ON' => $selected_on,
'SELECTED_OFF' => $selected_off,
'TR_ENABLED' => tr('Enabled'),
@@ -93,7 +93,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/settings_ports.php
===================================================================
--- gui/admin/settings_ports.php (revision 2801)
+++ gui/admin/settings_ports.php (working copy)
@@ -40,12 +40,12 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/settings_ports.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/settings_ports.tpl');
$tpl->define_dynamic('service_ports', 'page');
$tpl->define_dynamic('port_delete_link', 'service_ports');
$tpl->define_dynamic('port_delete_show', 'service_ports');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -237,7 +237,7 @@
array(
'CUSTOM' => $custom,
'VAR_NAME' => $rs->fields['name'],
- 'IP' => (($ip == '127.0.0.1') ? 'localhost' : (empty($ip) ? Config::get('BASE_SERVER_IP') : $ip)),
+ 'IP' => (($ip == '127.0.0.1') ? 'localhost' : (empty($ip) ? Config::getInstance()->get('BASE_SERVER_IP') : $ip)),
'PORT' => $port,
'SELECTED_UDP' => $selected_udp,
'SELECTED_TCP' => $selected_tcp,
@@ -263,8 +263,8 @@
update_services($sql);
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_settings.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_settings.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_settings.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_settings.tpl');
show_services($tpl, $sql);
@@ -295,7 +295,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/settings_server_traffic.php
===================================================================
--- gui/admin/settings_server_traffic.php (revision 2801)
+++ gui/admin/settings_server_traffic.php (working copy)
@@ -33,11 +33,11 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/settings_server_traffic.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/settings_server_traffic.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('hosting_plans', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -116,8 +116,8 @@
* static page messages.
*
*/
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_settings.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_settings.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_settings.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_settings.tpl');
$tpl->assign(
array(
@@ -138,7 +138,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/settings_welcome_mail.php
===================================================================
--- gui/admin/settings_welcome_mail.php (revision 2801)
+++ gui/admin/settings_welcome_mail.php (working copy)
@@ -33,11 +33,11 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/settings_welcome_mail.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/settings_welcome_mail.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('hosting_plans', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$user_id = $_SESSION['user_id'];
@@ -80,8 +80,8 @@
)
);
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_settings.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_settings.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_settings.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_settings.tpl');
$tpl->assign(
array(
@@ -111,7 +111,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/status_change.php
===================================================================
--- gui/admin/status_change.php (revision 2801)
+++ gui/admin/status_change.php (working copy)
@@ -59,13 +59,13 @@
$location = 'admin';
-if ($rs->fields['domain_status'] == Config::get('ITEM_OK_STATUS')) {
+if ($rs->fields['domain_status'] == Config::getInstance()->get('ITEM_OK_STATUS')) {
//disable_domain($sql, $domain_id, $rs->fields['domain_name']);
$action = 'disable';
change_domain_status($sql, $domain_id, $rs->fields['domain_name'], $action, $location);
-} else if ($rs->fields['domain_status'] == Config::get('ITEM_DISABLED_STATUS')) {
+} else if ($rs->fields['domain_status'] == Config::getInstance()->get('ITEM_DISABLED_STATUS')) {
//enable_domain($sql, $domain_id, $rs->fields['domain_name']);
$action = 'enable';
Index: gui/admin/system_info.php
===================================================================
--- gui/admin/system_info.php (revision 2801)
+++ gui/admin/system_info.php (working copy)
@@ -34,13 +34,13 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/system_info.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/system_info.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('hosting_plans', 'page');
$tpl->define_dynamic('disk_list', 'page');
$tpl->define_dynamic('disk_list_item', 'disk_list');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$sysinfo = new SystemInfo();
@@ -124,15 +124,15 @@
)
);
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_system_tools.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_system_tools.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_system_tools.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_system_tools.tpl');
gen_page_message($tpl);
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
Index: gui/admin/ticket_closed.php
===================================================================
--- gui/admin/ticket_closed.php (revision 2801)
+++ gui/admin/ticket_closed.php (working copy)
@@ -32,12 +32,12 @@
check_login(__FILE__);
-if (!Config::get('ISPCP_SUPPORT_SYSTEM')) {
+if (!Config::getInstance()->get('ISPCP_SUPPORT_SYSTEM')) {
user_goto('index.php');
}
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/ticket_closed.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/ticket_closed.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('tickets_list', 'page');
$tpl->define_dynamic('tickets_item', 'tickets_list');
@@ -50,7 +50,7 @@
function gen_tickets_list(&$tpl, &$sql, $user_id) {
$start_index = 0;
- $rows_per_page = Config::get('DOMAIN_ROWS_PER_PAGE');
+ $rows_per_page = Config::getInstance()->get('DOMAIN_ROWS_PER_PAGE');
if (isset($_GET['psi'])) {
$start_index = $_GET['psi'];
@@ -262,7 +262,7 @@
// common page data.
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -279,8 +279,8 @@
// static page messages.
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_ticket_system.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_ticket_system.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_ticket_system.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_ticket_system.tpl');
$tpl->assign(
array(
@@ -307,7 +307,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/ticket_system.php
===================================================================
--- gui/admin/ticket_system.php (revision 2801)
+++ gui/admin/ticket_system.php (working copy)
@@ -32,12 +32,12 @@
check_login(__FILE__);
-if (!Config::get('ISPCP_SUPPORT_SYSTEM')) {
+if (!Config::getInstance()->get('ISPCP_SUPPORT_SYSTEM')) {
user_goto('index.php');
}
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/ticket_system.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/ticket_system.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('tickets_list', 'page');
$tpl->define_dynamic('tickets_item', 'tickets_list');
@@ -51,7 +51,7 @@
function gen_tickets_list(&$tpl, &$sql, $user_id) {
$start_index = 0;
- $rows_per_page = Config::get('DOMAIN_ROWS_PER_PAGE');
+ $rows_per_page = Config::getInstance()->get('DOMAIN_ROWS_PER_PAGE');
if (isset($_GET['psi']))
$start_index = $_GET['psi'];
@@ -266,7 +266,7 @@
// common page data.
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -283,8 +283,8 @@
// static page messages.
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_ticket_system.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_ticket_system.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_ticket_system.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_ticket_system.tpl');
$tpl->assign(
array(
@@ -311,7 +311,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/admin/ticket_view.php
===================================================================
--- gui/admin/ticket_view.php (revision 2801)
+++ gui/admin/ticket_view.php (working copy)
@@ -32,12 +32,12 @@
check_login(__FILE__);
-if (!Config::get('ISPCP_SUPPORT_SYSTEM')) {
+if (!Config::getInstance()->get('ISPCP_SUPPORT_SYSTEM')) {
user_goto('index.php');
}
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/ticket_view.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/ticket_view.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('tickets_list', 'page');
$tpl->define_dynamic('tickets_item', 'tickets_list');
@@ -81,7 +81,7 @@
'URGENCY_ID' => $ticket_urgency));
get_ticket_from($tpl, $sql, $ticket_id);
- $date_formt = Config::get('DATE_FORMAT');
+ $date_formt = Config::getInstance()->get('DATE_FORMAT');
$ticket_content = wordwrap($rs->fields['ticket_message'], round(($screenwidth-200) / 7), "\n");
$tpl->assign(
@@ -129,7 +129,7 @@
$ticket_date = $rs->fields['ticket_date'];
$ticket_message = wordwrap($rs->fields['ticket_message'], round(($screenwidth-200) / 7), "\n");
- $date_formt = Config::get('DATE_FORMAT');
+ $date_formt = Config::getInstance()->get('DATE_FORMAT');
$tpl->assign(
array(
'DATE' => date($date_formt, $ticket_date),
@@ -184,7 +184,7 @@
}
// common page data.
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -391,8 +391,8 @@
}
// static page messages.
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_ticket_system.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_ticket_system.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_ticket_system.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_ticket_system.tpl');
$tpl->assign(
array(
@@ -415,6 +415,6 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
Index: gui/admin/user_delete.php
===================================================================
--- gui/admin/user_delete.php (revision 2801)
+++ gui/admin/user_delete.php (working copy)
@@ -32,7 +32,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('ADMIN_TEMPLATE_PATH') . '/user_delete.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/user_delete.tpl');
$tpl->define_dynamic('mail_list', 'page');
$tpl->define_dynamic('ftp_list', 'page');
@@ -49,7 +49,7 @@
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -76,15 +76,15 @@
user_goto('manage_users.php');
}
-gen_admin_mainmenu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
-gen_admin_menu($tpl, Config::get('ADMIN_TEMPLATE_PATH') . '/menu_users_manage.tpl');
+gen_admin_mainmenu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
+gen_admin_menu($tpl, Config::getInstance()->get('ADMIN_TEMPLATE_PATH') . '/menu_users_manage.tpl');
gen_page_message($tpl);
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
@@ -110,7 +110,7 @@
$domain_gid = $data['domain_gid'];
$reseller_id = $data['domain_created_id'];
- $delete_status = Config::get('ITEM_DELETE_STATUS');
+ $delete_status = Config::getInstance()->get('ITEM_DELETE_STATUS');
// Mail users:
exec_query($sql, "UPDATE `mail_users` SET `status` = '" . $delete_status . "' WHERE `domain_id` = ?", array($domain_id));
@@ -246,7 +246,7 @@
// delete reseller logo if exists
if(!empty($reseller_logo) && $reseller_logo !== 0) {
try {
- unlink(Config::get('IPS_LOGO_PATH') . '/' . $reseller_logo);
+ unlink(Config::getInstance()->get('IPS_LOGO_PATH') . '/' . $reseller_logo);
} catch(Exception $e) {
set_page_message(tr('Logo could not be deleted:') . " " . $e->getMessage());
}
Index: gui/client/alias_add.php
===================================================================
--- gui/client/alias_add.php (revision 2801)
+++ gui/client/alias_add.php (working copy)
@@ -33,13 +33,13 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/alias_add.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/alias_add.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('user_entry', 'page');
$tpl->define_dynamic('ip_entry', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -55,8 +55,8 @@
*
*/
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_manage_domains.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_manage_domains.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_manage_domains.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_manage_domains.tpl');
gen_logged_from($tpl);
@@ -239,7 +239,7 @@
$err_al = tr('Domain with that name already exists on the system!');
} else if (!validates_mpoint($mount_point) && $mount_point != '/') {
$err_al = tr("Incorrect mount point syntax");
- } else if ($alias_name == Config::get('BASE_SERVER_VHOST')) {
+ } else if ($alias_name == Config::getInstance()->get('BASE_SERVER_VHOST')) {
$err_al = tr('Master domain cannot be used!');
} else if ($_POST['status'] == 1) {
if(substr_count($forward, '.') <= 2) {
@@ -283,7 +283,7 @@
// Begin add new alias domain
$alias_name = htmlspecialchars($alias_name, ENT_QUOTES, "UTF-8");
- $status = Config::get('ITEM_ORDERED_STATUS');
+ $status = Config::getInstance()->get('ITEM_ORDERED_STATUS');
$query = "INSERT INTO `domain_aliasses` (`domain_id`, `alias_name`, `alias_mount`, `alias_status`, `alias_ip_id`, `url_forward`) VALUES (?, ?, ?, ?, ?, ?)";
exec_query($sql, $query, array($cr_user_id, $alias_name, $mount_point, $status, $domain_ip, $forward));
@@ -294,7 +294,7 @@
$admin_login = $_SESSION['user_logged'];
- if ($status == Config::get('ITEM_ORDERED_STATUS')) {
+ if ($status == Config::getInstance()->get('ITEM_ORDERED_STATUS')) {
// notify the reseller:
send_alias_order_email($alias_name);
@@ -329,6 +329,6 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
Index: gui/client/alias_edit.php
===================================================================
--- gui/client/alias_edit.php (revision 2801)
+++ gui/client/alias_edit.php (working copy)
@@ -33,47 +33,43 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/alias_edit.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->getInstance()->get('CLIENT_TEMPLATE_PATH') . '/alias_edit.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->getInstance()->get('USER_INITIAL_THEME');
-$tpl->assign(
- array(
- 'TR_EDIT_ALIAS_PAGE_TITLE' => tr('ispCP - Manage Domain Alias/Edit Alias'),
- 'THEME_COLOR_PATH' => "../themes/$theme_color",
- 'THEME_CHARSET' => tr('encoding'),
- 'ISP_LOGO' => get_logo($_SESSION['user_id'])
- )
-);
+$tpl->assign(array(
+ 'TR_EDIT_ALIAS_PAGE_TITLE' => tr('ispCP - Manage Domain Alias/Edit Alias'),
+ 'THEME_COLOR_PATH' => "../themes/$theme_color",
+ 'THEME_CHARSET' => tr('encoding'),
+ 'ISP_LOGO' => get_logo($_SESSION['user_id'])
+));
/*
*
* static page messages.
*
*/
-$tpl->assign(
- array(
- 'TR_MANAGE_DOMAIN_ALIAS' => tr('Manage domain alias'),
- 'TR_EDIT_ALIAS' => tr('Edit domain alias'),
- 'TR_ALIAS_NAME' => tr('Alias name'),
- 'TR_DOMAIN_IP' => tr('Domain IP'),
- 'TR_FORWARD' => tr('Forward to URL'),
- 'TR_MOUNT_POINT' => tr('Mount Point'),
- 'TR_MODIFY' => tr('Modify'),
- 'TR_CANCEL' => tr('Cancel'),
- 'TR_ENABLE_FWD' => tr("Enable Forward"),
- 'TR_ENABLE' => tr("Enable"),
- 'TR_DISABLE' => tr("Disable"),
- 'TR_PREFIX_HTTP' => 'http://',
- 'TR_PREFIX_HTTPS' => 'https://',
- 'TR_PREFIX_FTP' => 'ftp://'
- )
-);
+$tpl->assign(array(
+ 'TR_MANAGE_DOMAIN_ALIAS' => tr('Manage domain alias'),
+ 'TR_EDIT_ALIAS' => tr('Edit domain alias'),
+ 'TR_ALIAS_NAME' => tr('Alias name'),
+ 'TR_DOMAIN_IP' => tr('Domain IP'),
+ 'TR_FORWARD' => tr('Forward to URL'),
+ 'TR_MOUNT_POINT' => tr('Mount Point'),
+ 'TR_MODIFY' => tr('Modify'),
+ 'TR_CANCEL' => tr('Cancel'),
+ 'TR_ENABLE_FWD' => tr("Enable Forward"),
+ 'TR_ENABLE' => tr("Enable"),
+ 'TR_DISABLE' => tr("Disable"),
+ 'TR_PREFIX_HTTP' => 'http://',
+ 'TR_PREFIX_HTTPS' => 'https://',
+ 'TR_PREFIX_FTP' => 'ftp://'
+));
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_manage_domains.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_manage_domains.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_manage_domains.tpl');
+gen_client_menu($tpl, Config::getInstance()->getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_manage_domains.tpl');
gen_logged_from($tpl);
@@ -108,7 +104,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
@@ -143,42 +139,34 @@
$check_en = '';
$check_dis = 'checked="checked"';
$url_forward = '';
- $tpl->assign(
- array(
- 'READONLY_FORWARD' => ' readonly',
- 'DISABLE_FORWARD' => ' disabled="disabled"'
- )
- );
+ $tpl->assign(array(
+ 'READONLY_FORWARD' => ' readonly',
+ 'DISABLE_FORWARD' => ' disabled="disabled"'
+ ));
} else {
$check_en = 'checked="checked"';
$check_dis = '';
- $tpl->assign(
- array(
- 'READONLY_FORWARD' => '',
- 'DISABLE_FORWARD' => '',
- 'HTTP_YES' => (preg_match("/http:\/\//", $data['url_forward'])) ? 'selected="selected"' : '',
- 'HTTPS_YES' => (preg_match("/https:\/\//", $data['url_forward'])) ? 'selected="selected"' : '',
- 'FTP_YES' => (preg_match("/ftp:\/\//", $data['url_forward'])) ? 'selected="selected"' : ''
- )
- );
+ $tpl->assign(array(
+ 'READONLY_FORWARD' => '',
+ 'DISABLE_FORWARD' => '',
+ 'HTTP_YES' => (preg_match("/http:\/\//", $data['url_forward'])) ? 'selected="selected"' : '',
+ 'HTTPS_YES' => (preg_match("/https:\/\//", $data['url_forward'])) ? 'selected="selected"' : '',
+ 'FTP_YES' => (preg_match("/ftp:\/\//", $data['url_forward'])) ? 'selected="selected"' : ''
+ ));
}
- $tpl->assign(
- array(
- 'CHECK_EN' => $check_en,
- 'CHECK_DIS' => $check_dis
- )
- );
+ $tpl->assign(array(
+ 'CHECK_EN' => $check_en,
+ 'CHECK_DIS' => $check_dis
+ ));
}
// Fill in the fields
- $tpl->assign(
- array(
- 'ALIAS_NAME' => decode_idna($data['alias_name']),
- 'DOMAIN_IP' => $ip_data,
- 'FORWARD' => $url_forward,
- 'MOUNT_POINT' => $data['alias_mount'],
- 'ID' => $edit_id
- )
- );
+ $tpl->assign(array(
+ 'ALIAS_NAME' => decode_idna($data['alias_name']),
+ 'DOMAIN_IP' => $ip_data,
+ 'FORWARD' => $url_forward,
+ 'MOUNT_POINT' => $data['alias_mount'],
+ 'ID' => $edit_id
+ ));
} // End of gen_editalias_page()
/**
@@ -208,28 +196,24 @@
$check_en = 'checked="checked"';
$check_dis = '';
- $tpl->assign(
- array(
- 'FORWARD' => $forward_url,
- 'HTTP_YES' => ($forward_prefix === 'http://') ? 'selected="selected"' : '',
- 'HTTPS_YES' => ($forward_prefix === 'https://') ? 'selected="selected"' : '',
- 'FTP_YES' => ($forward_prefix === 'ftp://') ? 'selected="selected"' : '',
- 'CHECK_EN' => $check_en,
- 'CHECK_DIS' => $check_dis,
- )
- );
+ $tpl->assign(array(
+ 'FORWARD' => $forward_url,
+ 'HTTP_YES' => ($forward_prefix === 'http://') ? 'selected="selected"' : '',
+ 'HTTPS_YES' => ($forward_prefix === 'https://') ? 'selected="selected"' : '',
+ 'FTP_YES' => ($forward_prefix === 'ftp://') ? 'selected="selected"' : '',
+ 'CHECK_EN' => $check_en,
+ 'CHECK_DIS' => $check_dis,
+ ));
} else {
$check_en = '';
$check_dis = 'checked="checked"';
$forward_url = 'no';
- $tpl->assign(
- array(
- 'READONLY_FORWARD' => ' readonly',
- 'DISABLE_FORWARD' => ' disabled="disabled"',
- 'CHECK_EN' => $check_en,
- 'CHECK_DIS' => $check_dis,
- )
- );
+ $tpl->assign(array(
+ 'READONLY_FORWARD' => ' readonly',
+ 'DISABLE_FORWARD' => ' disabled="disabled"',
+ 'CHECK_EN' => $check_en,
+ 'CHECK_DIS' => $check_dis,
+ ));
}
if ($ed_error === '_off_') {
@@ -242,7 +226,7 @@
WHERE
`alias_id` = ?
";
- exec_query($sql, $query, array($forward_url, Config::get('ITEM_CHANGE_STATUS'), $alias_id));
+ exec_query($sql, $query, array($forward_url, Config::getInstance()->getInstance()->get('ITEM_CHANGE_STATUS'), $alias_id));
$query = "
UPDATE
@@ -252,7 +236,7 @@
WHERE
`alias_id` = ?
";
- exec_query($sql, $query, array(Config::get('ITEM_CHANGE_STATUS'), $alias_id));
+ exec_query($sql, $query, array(Config::getInstance()->getInstance()->get('ITEM_CHANGE_STATUS'), $alias_id));
send_request();
Index: gui/client/alias_order_delete.php
===================================================================
--- gui/client/alias_order_delete.php (revision 2801)
+++ gui/client/alias_order_delete.php (working copy)
@@ -36,7 +36,7 @@
check_login(__FILE__);
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
if (isset($_GET['del_id']) && !empty($_GET['del_id'])) {
$del_id = $_GET['del_id'];
Index: gui/client/backup.php
===================================================================
--- gui/client/backup.php (revision 2801)
+++ gui/client/backup.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/backup.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/backup.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
@@ -61,7 +61,7 @@
// common page data.
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -78,18 +78,18 @@
// static page messages.
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_webtools.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_webtools.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_webtools.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_webtools.tpl');
gen_logged_from($tpl);
check_permissions($tpl);
-if (Config::get('ZIP') == "gzip") {
+if (Config::getInstance()->get('ZIP') == "gzip") {
$name = "backup_YYYY_MM_DD.tar.gz";
-} else if (Config::get('ZIP') == "bzip2") {
+} else if (Config::getInstance()->get('ZIP') == "bzip2") {
$name = "backup_YYYY_MM_DD.tar.bz2";
-} else { // Config::get('ZIP') == "lzma"
+} else { // Config::getInstance()->get('ZIP') == "lzma"
$name = "backup_YYYY_MM_DD.tar.lzma";
}
@@ -114,7 +114,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/client/cronjobs_add.php
===================================================================
--- gui/client/cronjobs_add.php (revision 2801)
+++ gui/client/cronjobs_add.php (working copy)
@@ -33,11 +33,11 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/cronjobs_add.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/cronjobs_add.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -60,8 +60,8 @@
*
*/
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_webtools.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_webtools.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_webtools.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_webtools.tpl');
gen_logged_from($tpl);
@@ -96,7 +96,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/client/cronjobs_edit.php
===================================================================
--- gui/client/cronjobs_edit.php (revision 2801)
+++ gui/client/cronjobs_edit.php (working copy)
@@ -33,11 +33,11 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/cronjobs_edit.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/cronjobs_edit.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -66,8 +66,8 @@
*
*/
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_webtools.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_webtools.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_webtools.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_webtools.tpl');
gen_logged_from($tpl);
@@ -104,7 +104,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/client/cronjobs_overview.php
===================================================================
--- gui/client/cronjobs_overview.php (revision 2801)
+++ gui/client/cronjobs_overview.php (working copy)
@@ -33,12 +33,12 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/cronjobs_overview.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/cronjobs_overview.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('cronjobs', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -69,8 +69,8 @@
*
*/
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_webtools.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_webtools.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_webtools.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_webtools.tpl');
gen_logged_from($tpl);
@@ -96,7 +96,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/client/dns_delete.php
===================================================================
--- gui/client/dns_delete.php (revision 2801)
+++ gui/client/dns_delete.php (working copy)
@@ -82,7 +82,7 @@
WHERE
`domain`.`domain_id` = ?
";
- exec_query($sql, $query, array(Config::get('ITEM_CHANGE_STATUS'), $dmn_id));
+ exec_query($sql, $query, array(Config::getInstance()->get('ITEM_CHANGE_STATUS'), $dmn_id));
$query = "
UPDATE
`subdomain`
@@ -91,7 +91,7 @@
WHERE
`subdomain`.`domain_id` = ?
";
- exec_query($sql, $query, array(Config::get('ITEM_CHANGE_STATUS'), $dmn_id));
+ exec_query($sql, $query, array(Config::getInstance()->get('ITEM_CHANGE_STATUS'), $dmn_id));
} else {
$query = "
UPDATE
@@ -102,7 +102,7 @@
`domain_aliasses`.`domain_id` = ?
AND `domain_aliasses`.`alias_id` = ?
";
- exec_query($sql, $query, array(Config::get('ITEM_CHANGE_STATUS'), $dmn_id, $alias_id));
+ exec_query($sql, $query, array(Config::getInstance()->get('ITEM_CHANGE_STATUS'), $dmn_id, $alias_id));
$query = "
UPDATE
@@ -112,7 +112,7 @@
WHERE
`subdomain_alias`.`alias_id` = ?
";
- exec_query($sql, $query, array(Config::get('ITEM_CHANGE_STATUS'), $alias_id));
+ exec_query($sql, $query, array(Config::getInstance()->get('ITEM_CHANGE_STATUS'), $alias_id));
}
send_request();
Index: gui/client/dns_edit.php
===================================================================
--- gui/client/dns_edit.php (revision 2801)
+++ gui/client/dns_edit.php (working copy)
@@ -31,11 +31,11 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/dns_edit.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/dns_edit.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$DNS_allowed_types = array('A','AAAA','SRV','CNAME','MX');
@@ -81,8 +81,8 @@
)
);
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_manage_domains.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_manage_domains.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_manage_domains.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_manage_domains.tpl');
gen_logged_from($tpl);
$tpl->assign(($add_mode) ? 'FORM_EDIT_MODE' : 'FORM_ADD_MODE', '');
@@ -124,7 +124,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
@@ -263,7 +263,7 @@
AND `alias_status` <> :state
";
- $res = exec_query($sql, $query, array('domain_id'=>$dmn_id,'state'=>Config::get('ITEM_ORDERED_STATUS')));
+ $res = exec_query($sql, $query, array('domain_id'=>$dmn_id,'state'=>Config::getInstance()->get('ITEM_ORDERED_STATUS')));
$sel = '';
while ($row = $res->FetchRow()) {
$sel.= '';
@@ -590,7 +590,7 @@
WHERE
`domain`.`domain_id` = ?
";
- exec_query($sql, $query, array(Config::get('ITEM_DNSCHANGE_STATUS'), $dmn_id));
+ exec_query($sql, $query, array(Config::getInstance()->get('ITEM_DNSCHANGE_STATUS'), $dmn_id));
$query = "
UPDATE
`subdomain`
@@ -599,7 +599,7 @@
WHERE
`subdomain`.`domain_id` = ?
";
- exec_query($sql, $query, array(Config::get('ITEM_DNSCHANGE_STATUS'), $dmn_id));
+ exec_query($sql, $query, array(Config::getInstance()->get('ITEM_DNSCHANGE_STATUS'), $dmn_id));
} else {
$query = "
UPDATE
@@ -610,7 +610,7 @@
`domain_aliasses`.`domain_id` = ?
AND `domain_aliasses`.`alias_id` = ?
";
- exec_query($sql, $query, array(Config::get('ITEM_CHANGE_STATUS'), $dmn_id, $alias_id));
+ exec_query($sql, $query, array(Config::getInstance()->get('ITEM_CHANGE_STATUS'), $dmn_id, $alias_id));
$query = "
UPDATE
@@ -620,7 +620,7 @@
WHERE
`subdomain_alias`.`alias_id` = ?
";
- exec_query($sql, $query, array(Config::get('ITEM_CHANGE_STATUS'), $alias_id));
+ exec_query($sql, $query, array(Config::getInstance()->get('ITEM_CHANGE_STATUS'), $alias_id));
}
send_request();
Index: gui/client/domain_statistics.php
===================================================================
--- gui/client/domain_statistics.php (revision 2801)
+++ gui/client/domain_statistics.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/domain_statistics.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/domain_statistics.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('month_item', 'page');
@@ -180,7 +180,7 @@
$sum_mail += $smtp_trf;
$sum_pop += $pop_trf;
- $date_formt = Config::get('DATE_FORMAT');
+ $date_formt = Config::getInstance()->get('DATE_FORMAT');
$tpl->assign(
array(
'DATE' => date($date_formt, strtotime($year . "-" . $month . "-" . $i)),
@@ -296,7 +296,7 @@
// common page data.
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -316,8 +316,8 @@
// static page messages.
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_statistics.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_statistics.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_statistics.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_statistics.tpl');
gen_logged_from($tpl);
@@ -345,7 +345,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/client/domains_manage.php
===================================================================
--- gui/client/domains_manage.php (revision 2801)
+++ gui/client/domains_manage.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/domains_manage.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/domains_manage.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('als_message', 'page');
@@ -126,7 +126,7 @@
}
function gen_user_dns_action($action, $dns_id, $status) {
- if ($status === Config::get('ITEM_OK_STATUS')) {
+ if ($status === Config::getInstance()->get('ITEM_OK_STATUS')) {
return array(tr($action), 'dns_'.strtolower($action).'.php?edit_id='.$dns_id);
} else {
return array(tr('N/A'), '#');
@@ -134,7 +134,7 @@
}
function gen_user_sub_action($sub_id, $sub_status) {
- if ($sub_status === Config::get('ITEM_OK_STATUS')) {
+ if ($sub_status === Config::getInstance()->get('ITEM_OK_STATUS')) {
return array(tr('Delete'), "subdomain_delete.php?id=$sub_id");
} else {
return array(tr('N/A'), '#');
@@ -142,7 +142,7 @@
}
function gen_user_alssub_action($sub_id, $sub_status) {
- if ($sub_status === Config::get('ITEM_OK_STATUS')) {
+ if ($sub_status === Config::getInstance()->get('ITEM_OK_STATUS')) {
return array(tr('Delete'), "alssub_delete.php?id=$sub_id");
} else {
return array(tr('N/A'), '#');
@@ -239,9 +239,9 @@
}
function gen_user_als_action($als_id, $als_status) {
- if ($als_status === Config::get('ITEM_OK_STATUS')) {
+ if ($als_status === Config::getInstance()->get('ITEM_OK_STATUS')) {
return array(tr('Delete'), 'alias_delete.php?id=' . $als_id);
- } else if ($als_status === Config::get('ITEM_ORDERED_STATUS')) {
+ } else if ($als_status === Config::getInstance()->get('ITEM_ORDERED_STATUS')) {
return array(tr('Delete order'), 'alias_order_delete.php?del_id=' . $als_id);
} else {
return array(tr('N/A'), '#');
@@ -327,7 +327,7 @@
// common page data.
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -345,8 +345,8 @@
gen_user_dns_list($tpl, $sql, $_SESSION['user_id']);
// static page messages.
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_manage_domains.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_manage_domains.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_manage_domains.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_manage_domains.tpl');
gen_logged_from($tpl);
@@ -382,7 +382,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/client/error_edit.php
===================================================================
--- gui/client/error_edit.php (revision 2801)
+++ gui/client/error_edit.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/error_edit.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/error_edit.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
@@ -53,7 +53,7 @@
// common page data.
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -86,8 +86,8 @@
// static page messages.
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_webtools.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_webtools.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_webtools.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_webtools.tpl');
gen_logged_from($tpl);
@@ -107,7 +107,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/client/error_pages.php
===================================================================
--- gui/client/error_pages.php (revision 2801)
+++ gui/client/error_pages.php (working copy)
@@ -38,7 +38,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/error_pages.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/error_pages.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
@@ -65,7 +65,7 @@
}
}
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
// common page data.
@@ -88,8 +88,8 @@
// static page messages.
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_webtools.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_webtools.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_webtools.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_webtools.tpl');
gen_logged_from($tpl);
@@ -112,7 +112,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/client/ftp_accounts.php
===================================================================
--- gui/client/ftp_accounts.php (revision 2801)
+++ gui/client/ftp_accounts.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/ftp_accounts.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/ftp_accounts.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('mail_message', 'page');
@@ -130,7 +130,7 @@
// common page data.
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -151,8 +151,8 @@
// static page messages.
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_ftp_accounts.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_ftp_accounts.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_ftp_accounts.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_ftp_accounts.tpl');
gen_logged_from($tpl);
@@ -180,7 +180,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/client/ftp_add.php
===================================================================
--- gui/client/ftp_add.php (revision 2801)
+++ gui/client/ftp_add.php (working copy)
@@ -34,7 +34,7 @@
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/ftp_add.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/ftp_add.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('als_list', 'page');
@@ -93,7 +93,7 @@
}
function gen_dmn_als_list(&$tpl, &$sql, $dmn_id, $post_check) {
- $ok_status = Config::get('ITEM_OK_STATUS');
+ $ok_status = Config::getInstance()->get('ITEM_OK_STATUS');
$query = <<get('ITEM_OK_STATUS');
$query = <<get('FTP_USERNAME_SEPARATOR') . $dmn_name;
+ $ftp_home = Config::getInstance()->get('FTP_HOMEDIR') . "/$dmn_name";
break;
// Default mount point for an alias domain
case 'als':
- $ftp_user = $username . Config::get('FTP_USERNAME_SEPARATOR') . $_POST['als_id'];
+ $ftp_user = $username . Config::getInstance()->get('FTP_USERNAME_SEPARATOR') . $_POST['als_id'];
$alias_mount_point = get_alias_mount_point($sql, $_POST['als_id']);
- $ftp_home = Config::get('FTP_HOMEDIR') . "/$dmn_name" . $alias_mount_point;
+ $ftp_home = Config::getInstance()->get('FTP_HOMEDIR') . "/$dmn_name" . $alias_mount_point;
break;
// Default mount point for a subdomain
case 'sub':
- $ftp_user = $username . Config::get('FTP_USERNAME_SEPARATOR') . $_POST['sub_id'] . '.' . $dmn_name;
- $ftp_home = Config::get('FTP_HOMEDIR') . "/$dmn_name/" . clean_input($_POST['sub_id']);
+ $ftp_user = $username . Config::getInstance()->get('FTP_USERNAME_SEPARATOR') . $_POST['sub_id'] . '.' . $dmn_name;
+ $ftp_home = Config::getInstance()->get('FTP_HOMEDIR') . "/$dmn_name/" . clean_input($_POST['sub_id']);
break;
// Unknown domain type (?)
default:
@@ -390,7 +390,7 @@
set_page_message(tr('Incorrect mount point length or syntax'));
return;
}
- $ftp_home = Config::get('FTP_HOMEDIR') . "/$dmn_name/" . $ftp_vhome;
+ $ftp_home = Config::getInstance()->get('FTP_HOMEDIR') . "/$dmn_name/" . $ftp_vhome;
// Strip possible double-slashes
$ftp_home = str_replace('//', '/', $ftp_home);
// Check for $ftp_vhome existence
@@ -410,7 +410,7 @@
if ($ftp_uid == -1) return;
- $ftp_shell = Config::get('CMD_SHELL');
+ $ftp_shell = Config::getInstance()->get('CMD_SHELL');
$ftp_passwd = crypt_user_pass_with_salt($_POST['pass']);
$query = <<get('PASSWD_STRONG')) {
+ set_page_message(sprintf(tr('The password must be at least %s long and contain letters and numbers to be valid.'), Config::getInstance()->get('PASSWD_CHARS')));
} else {
- set_page_message(sprintf(tr('Password data is shorter than %s signs or includes not permitted signs!'), Config::get('PASSWD_CHARS')));
+ set_page_message(sprintf(tr('Password data is shorter than %s signs or includes not permitted signs!'), Config::getInstance()->get('PASSWD_CHARS')));
}
return;
}
@@ -555,7 +555,7 @@
// common page data.
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -572,8 +572,8 @@
// static page messages.
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_ftp_accounts.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_ftp_accounts.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_ftp_accounts.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_ftp_accounts.tpl');
gen_logged_from($tpl);
@@ -591,7 +591,7 @@
'TR_USE_OTHER_DIR' => tr('Use other dir'),
'TR_ADD' => tr('Add'),
'CHOOSE_DIR' => tr('Choose dir'),
- 'FTP_SEPARATOR' => Config::get('FTP_USERNAME_SEPARATOR')
+ 'FTP_SEPARATOR' => Config::getInstance()->get('FTP_USERNAME_SEPARATOR')
)
);
@@ -599,6 +599,6 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
Index: gui/client/ftp_choose_dir.php
===================================================================
--- gui/client/ftp_choose_dir.php (revision 2801)
+++ gui/client/ftp_choose_dir.php (working copy)
@@ -38,9 +38,9 @@
$tpl->define_dynamic('dir_item', 'page');
$tpl->define_dynamic('action_link', 'page');
$tpl->define_dynamic('list_item', 'page');
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/ftp_choose_dir.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/ftp_choose_dir.tpl');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
function gen_directories(&$tpl) {
$sql = Database::getInstance();
@@ -130,7 +130,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/client/ftp_edit.php
===================================================================
--- gui/client/ftp_edit.php (revision 2801)
+++ gui/client/ftp_edit.php (working copy)
@@ -41,7 +41,7 @@
}
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/ftp_edit.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/ftp_edit.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
@@ -61,7 +61,7 @@
$homedir = $rs->fields['homedir'];
$domain_ftp = $_SESSION['user_logged'];
- $nftp_dir = Config::get('FTP_HOMEDIR') . "/" . $domain_ftp;
+ $nftp_dir = Config::getInstance()->get('FTP_HOMEDIR') . "/" . $domain_ftp;
if ($nftp_dir == $homedir) {
$odir = '';
@@ -94,10 +94,10 @@
return;
}
if (!chk_password($_POST['pass'])) {
- if (Config::get('PASSWD_STRONG')) {
- set_page_message(sprintf(tr('The password must be at least %s long and contain letters and numbers to be valid.'), Config::get('PASSWD_CHARS')));
+ if (Config::getInstance()->get('PASSWD_STRONG')) {
+ set_page_message(sprintf(tr('The password must be at least %s long and contain letters and numbers to be valid.'), Config::getInstance()->get('PASSWD_CHARS')));
} else {
- set_page_message(sprintf(tr('Password data is shorter than %s signs or includes not permitted signs!'), Config::get('PASSWD_CHARS')));
+ set_page_message(sprintf(tr('Password data is shorter than %s signs or includes not permitted signs!'), Config::getInstance()->get('PASSWD_CHARS')));
}
return;
}
@@ -116,7 +116,7 @@
// append the full path (vfs is always checking per ftp so it's logged
// in in the root of the user (no absolute paths are allowed here!)
- $other_dir = Config::get('FTP_HOMEDIR') . "/" . $_SESSION['user_logged']
+ $other_dir = Config::getInstance()->get('FTP_HOMEDIR') . "/" . $_SESSION['user_logged']
. clean_input($_POST['other_dir']);
$query = <<get('FTP_HOMEDIR') . "/$dmn_name/" . $other_dir;
// Strip possible double-slashes
$ftp_home = str_replace('//', '/', $other_dir);
// Check for $other_dir existence
@@ -168,10 +168,10 @@
set_page_message(tr('%s does not exist', $other_dir));
return;
}
- $other_dir = Config::get('FTP_HOMEDIR') . "/" . $_SESSION['user_logged'] . $other_dir;
+ $other_dir = Config::getInstance()->get('FTP_HOMEDIR') . "/" . $_SESSION['user_logged'] . $other_dir;
} else { // End of user-specified mount-point
- $other_dir = Config::get('FTP_HOMEDIR') . "/" . $_SESSION['user_logged'];
+ $other_dir = Config::getInstance()->get('FTP_HOMEDIR') . "/" . $_SESSION['user_logged'];
}
$query = <<get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -225,8 +225,8 @@
// static page messages.
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_ftp_accounts.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_ftp_accounts.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_ftp_accounts.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_ftp_accounts.tpl');
gen_logged_from($tpl);
@@ -252,7 +252,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/client/hosting_plan_update.php
===================================================================
--- gui/client/hosting_plan_update.php (revision 2801)
+++ gui/client/hosting_plan_update.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/hosting_plan_update.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/hosting_plan_update.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('def_language', 'page');
$tpl->define_dynamic('logged_from', 'page');
@@ -126,7 +126,7 @@
$hp_title = tr('Your order');
} else {
// generate all hosting plans available for purchasing
- if (Config::exists('HOSTING_PLANS_LEVEL') && Config::get('HOSTING_PLANS_LEVEL') === 'admin') {
+ if (Config::getInstance()->exists('HOSTING_PLANS_LEVEL') && Config::getInstance()->get('HOSTING_PLANS_LEVEL') === 'admin') {
$query = "
SELECT
t1.*,
@@ -425,7 +425,7 @@
}
}
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
'TR_CLIENT_UPDATE_HP' => tr('ispCP - Update hosting plan'),
@@ -579,7 +579,7 @@
$message = tr("You have an update order for the account %s\n\nPlease login into your ispCP control panel at %s for more details",
true,
$_SESSION['user_logged'],
- Config::get('BASE_SERVER_VHOST_PREFIX') . Config::get('BASE_SERVER_VHOST'));
+ Config::getInstance()->get('BASE_SERVER_VHOST_PREFIX') . Config::getInstance()->get('BASE_SERVER_VHOST'));
$mail_result = mail($to, $subject, $message, $headers);
}
@@ -615,8 +615,8 @@
gen_hp($tpl, $sql, $_SESSION['user_id']);
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_general_information.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_general_information.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_general_information.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_general_information.tpl');
gen_logged_from($tpl);
@@ -635,7 +635,7 @@
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/client/index.php
===================================================================
--- gui/client/index.php (revision 2801)
+++ gui/client/index.php (working copy)
@@ -30,11 +30,11 @@
require '../include/ispcp-lib.php';
-check_login(__FILE__, Config::get('PREVENT_EXTERNAL_LOGIN_CLIENT'));
+check_login(__FILE__, Config::getInstance()->get('PREVENT_EXTERNAL_LOGIN_CLIENT'));
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/index.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/index.tpl');
$tpl->define_dynamic('def_language', 'page');
$tpl->define_dynamic('def_layout', 'page');
$tpl->define_dynamic('no_messages', 'page');
@@ -328,7 +328,7 @@
*
*/
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
if (isset($_POST['uaction']) && $_POST['uaction'] === 'save_layout') {
$user_id = $_SESSION['user_id'];
@@ -407,7 +407,7 @@
if ($dmn_expires == 0) {
$dmn_expires_date = tr('N/A');
} else {
- $date_formt = Config::get('DATE_FORMAT');
+ $date_formt = Config::getInstance()->get('DATE_FORMAT');
$dmn_expires_date = date($date_formt, $dmn_expires);
}
@@ -463,8 +463,8 @@
*
*/
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_general_information.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_general_information.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_general_information.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_general_information.tpl');
gen_logged_from($tpl);
@@ -509,6 +509,6 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
Index: gui/client/language.php
===================================================================
--- gui/client/language.php (revision 2801)
+++ gui/client/language.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/language.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/language.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('def_language', 'page');
$tpl->define_dynamic('logged_from', 'page');
@@ -62,7 +62,7 @@
set_page_message(tr('User language updated successfully!'));
}
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
// Makes sure that the language selected is the client's language
if (!isset($_SESSION['logged_from']) && !isset($_SESSION['logged_from_id'])) {
@@ -88,8 +88,8 @@
*
*/
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_general_information.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_general_information.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_general_information.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_general_information.tpl');
gen_logged_from($tpl);
@@ -108,7 +108,7 @@
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/client/mail_accounts.php
===================================================================
--- gui/client/mail_accounts.php (revision 2801)
+++ gui/client/mail_accounts.php (working copy)
@@ -35,7 +35,7 @@
$tpl = new pTemplate();
$tpl->define_dynamic(
'page',
- Config::get('CLIENT_TEMPLATE_PATH') . '/mail_accounts.tpl'
+ Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/mail_accounts.tpl'
);
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
@@ -46,7 +46,7 @@
$tpl->define_dynamic('mails_total', 'page');
$tpl->define_dynamic('no_mails', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -68,7 +68,7 @@
*/
function gen_user_mail_action($mail_id, $mail_status) {
- if ($mail_status === Config::get('ITEM_OK_STATUS')) {
+ if ($mail_status === Config::getInstance()->get('ITEM_OK_STATUS')) {
return array(
tr('Delete'),
"mail_delete.php?id=$mail_id",
@@ -94,7 +94,7 @@
&$tpl, $mail_id, $mail_type, $mail_status, $mail_auto_respond
) {
- if ($mail_status === Config::get('ITEM_OK_STATUS')) {
+ if ($mail_status === Config::getInstance()->get('ITEM_OK_STATUS')) {
if ($mail_auto_respond == false) {
$tpl->assign(
array(
@@ -723,7 +723,7 @@
$default_mails = count_default_mails($sql, $dmn_id);
- if (Config::get('COUNT_DEFAULT_EMAIL_ADDRESSES') == 0) {
+ if (Config::getInstance()->get('COUNT_DEFAULT_EMAIL_ADDRESSES') == 0) {
if(isset($_POST['uaction']) && $_POST['uaction'] == 'show') {
$counted_mails -= $default_mails;
}
@@ -819,12 +819,12 @@
gen_client_mainmenu(
$tpl,
- Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_email_accounts.tpl'
+ Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_email_accounts.tpl'
);
gen_client_menu(
$tpl,
- Config::get('CLIENT_TEMPLATE_PATH') . '/menu_email_accounts.tpl'
+ Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_email_accounts.tpl'
);
gen_logged_from($tpl);
@@ -878,7 +878,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/client/mail_add.php
===================================================================
--- gui/client/mail_add.php (revision 2801)
+++ gui/client/mail_add.php (working copy)
@@ -34,7 +34,7 @@
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/mail_add.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/mail_add.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('als_list', 'page');
@@ -89,7 +89,7 @@
}
function gen_dmn_als_list(&$tpl, &$sql, $dmn_id, $post_check) {
- $ok_status = Config::get('ITEM_OK_STATUS');
+ $ok_status = Config::getInstance()->get('ITEM_OK_STATUS');
$query = "
SELECT
@@ -156,7 +156,7 @@
}
function gen_dmn_sub_list(&$tpl, &$sql, $dmn_id, $dmn_name, $post_check) {
- $ok_status = Config::get('ITEM_OK_STATUS');
+ $ok_status = Config::getInstance()->get('ITEM_OK_STATUS');
$query = "
SELECT
@@ -226,7 +226,7 @@
}
function gen_dmn_als_sub_list(&$tpl, &$sql, $dmn_id, $post_check) {
- $ok_status = Config::get('ITEM_OK_STATUS');
+ $ok_status = Config::getInstance()->get('ITEM_OK_STATUS');
$query = "
SELECT
@@ -427,7 +427,7 @@
$domain_id,
$mail_type,
$sub_id,
- Config::get('ITEM_ADD_STATUS'),
+ Config::getInstance()->get('ITEM_ADD_STATUS'),
$mail_auto_respond,
$mail_auto_respond_text,
$mail_addr));
@@ -475,10 +475,10 @@
return false;
} else if (!chk_password($pass, 50, "/[`\xb4'\"\\\\\x01-\x1f\015\012|<>^$]/i")) {
// Not permitted chars
- if (Config::get('PASSWD_STRONG')) {
- set_page_message(sprintf(tr('The password must be at least %s long and contain letters and numbers to be valid.'), Config::get('PASSWD_CHARS')));
+ if (Config::getInstance()->get('PASSWD_STRONG')) {
+ set_page_message(sprintf(tr('The password must be at least %s long and contain letters and numbers to be valid.'), Config::getInstance()->get('PASSWD_CHARS')));
} else {
- set_page_message(sprintf(tr('Password data is shorter than %s signs or includes not permitted signs!'), Config::get('PASSWD_CHARS')));
+ set_page_message(sprintf(tr('Password data is shorter than %s signs or includes not permitted signs!'), Config::getInstance()->get('PASSWD_CHARS')));
}
return false;
}
@@ -603,7 +603,7 @@
header("Location: index.php");
}
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -620,8 +620,8 @@
// static page messages.
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_email_accounts.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_email_accounts.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_email_accounts.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_email_accounts.tpl');
gen_logged_from($tpl);
@@ -650,6 +650,6 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
Index: gui/client/mail_autoresponder_disable.php
===================================================================
--- gui/client/mail_autoresponder_disable.php (revision 2801)
+++ gui/client/mail_autoresponder_disable.php (working copy)
@@ -65,7 +65,7 @@
if (isset($_GET['id']) && $_GET['id'] !== '') {
$mail_id = $_GET['id'];
- $item_change_status = Config::get('ITEM_CHANGE_STATUS');
+ $item_change_status = Config::getInstance()->get('ITEM_CHANGE_STATUS');
$query = "
UPDATE
Index: gui/client/mail_autoresponder_edit.php
===================================================================
--- gui/client/mail_autoresponder_edit.php (revision 2801)
+++ gui/client/mail_autoresponder_edit.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/mail_autoresponder_enable.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/mail_autoresponder_enable.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
@@ -87,7 +87,7 @@
$arsp_message = clean_input($_POST['arsp_message']);
}
- $item_change_status = Config::get('ITEM_CHANGE_STATUS');
+ $item_change_status = Config::getInstance()->get('ITEM_CHANGE_STATUS');
if (isset($_POST['uaction']) && $_POST['uaction'] === 'enable_arsp') {
if (empty($_POST['arsp_message'])) {
@@ -153,7 +153,7 @@
header("Location: index.php");
}
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -171,8 +171,8 @@
// static page messages.
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_email_accounts.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_email_accounts.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_email_accounts.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_email_accounts.tpl');
gen_logged_from($tpl);
@@ -192,7 +192,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/client/mail_autoresponder_enable.php
===================================================================
--- gui/client/mail_autoresponder_enable.php (revision 2801)
+++ gui/client/mail_autoresponder_enable.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/mail_autoresponder_enable.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/mail_autoresponder_enable.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
@@ -76,7 +76,7 @@
}
$arsp_message = clean_input($_POST['arsp_message'], false);
- $item_change_status = Config::get('ITEM_CHANGE_STATUS');
+ $item_change_status = Config::getInstance()->get('ITEM_CHANGE_STATUS');
$query = "
UPDATE
@@ -150,7 +150,7 @@
header("Location: index.php");
}
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -168,8 +168,8 @@
// static page messages.
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_email_accounts.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_email_accounts.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_email_accounts.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_email_accounts.tpl');
gen_logged_from($tpl);
@@ -189,7 +189,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/client/mail_catchall.php
===================================================================
--- gui/client/mail_catchall.php (revision 2801)
+++ gui/client/mail_catchall.php (working copy)
@@ -37,7 +37,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/mail_catchall.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/mail_catchall.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('catchall_message', 'page');
@@ -47,7 +47,7 @@
// page functions.
function gen_user_mail_action($mail_id, $mail_status) {
- if ($mail_status === Config::get('ITEM_OK_STATUS')) {
+ if ($mail_status === Config::getInstance()->get('ITEM_OK_STATUS')) {
return array(tr('Delete'), "mail_delete.php?id=$mail_id", "mail_edit.php?id=$mail_id");
} else {
return array(tr('N/A'), '#', '#');
@@ -55,13 +55,13 @@
}
function gen_user_catchall_action($mail_id, $mail_status) {
- if ($mail_status === Config::get('ITEM_ADD_STATUS')) {
+ if ($mail_status === Config::getInstance()->get('ITEM_ADD_STATUS')) {
return array(tr('N/A'), '#'); // Addition in progress
- } else if ($mail_status === Config::get('ITEM_OK_STATUS')) {
+ } else if ($mail_status === Config::getInstance()->get('ITEM_OK_STATUS')) {
return array(tr('Delete CatchAll'), "mail_catchall_delete.php?id=$mail_id");
- } else if ($mail_status === Config::get('ITEM_CHANGE_STATUS')) {
+ } else if ($mail_status === Config::getInstance()->get('ITEM_CHANGE_STATUS')) {
return array(tr('N/A'), '#');
- } else if ($mail_status === Config::get('ITEM_DELETE_STATUS')) {
+ } else if ($mail_status === Config::getInstance()->get('ITEM_DELETE_STATUS')) {
return array(tr('N/A'), '#');
} else {
return null;
@@ -342,7 +342,7 @@
// common page data.
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -363,8 +363,8 @@
// static page messages.
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_email_accounts.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_email_accounts.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_email_accounts.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_email_accounts.tpl');
gen_logged_from($tpl);
check_permissions($tpl);
@@ -385,7 +385,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/client/mail_catchall_add.php
===================================================================
--- gui/client/mail_catchall_add.php (revision 2801)
+++ gui/client/mail_catchall_add.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/mail_catchall_add.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/mail_catchall_add.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('mail_list', 'page');
@@ -89,7 +89,7 @@
user_goto('mail_catchall.php');
}
- $ok_status = Config::get('ITEM_OK_STATUS');
+ $ok_status = Config::getInstance()->get('ITEM_OK_STATUS');
$match = array();
if (preg_match("/(\d+);(normal|alias|subdom|alssub)/", $id, $match) == 1) {
$item_id = $match[1];
@@ -319,7 +319,7 @@
$rs = exec_query($sql, $query, array($mail_id));
$domain_id = $rs->fields['domain_id'];
$sub_id = $rs->fields['sub_id'];
- $status = Config::get('ITEM_ADD_STATUS');
+ $status = Config::getInstance()->get('ITEM_ADD_STATUS');
// find the mail_addr (catchall -> "@(sub/alias)domain.tld", should be domain part of mail_acc
$match = explode('@', $mail_acc);
@@ -415,7 +415,7 @@
$mail_acc[] = $value;
}
- $status = Config::get('ITEM_ADD_STATUS');
+ $status = Config::getInstance()->get('ITEM_ADD_STATUS');
$query = "
INSERT INTO `mail_users`
@@ -447,7 +447,7 @@
// common page data.
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -466,8 +466,8 @@
// static page messages.
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_email_accounts.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_email_accounts.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_email_accounts.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_email_accounts.tpl');
gen_logged_from($tpl);
@@ -488,7 +488,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/client/mail_catchall_delete.php
===================================================================
--- gui/client/mail_catchall_delete.php (revision 2801)
+++ gui/client/mail_catchall_delete.php (working copy)
@@ -34,7 +34,7 @@
if (isset($_GET['id']) && $_GET['id'] !== '') {
$mail_id = $_GET['id'];
- $item_delete_status = Config::get('ITEM_DELETE_STATUS');
+ $item_delete_status = Config::getInstance()->get('ITEM_DELETE_STATUS');
$dmn_id = get_user_domain_id($sql, $_SESSION['user_id']);
$query = "
Index: gui/client/mail_delete.php
===================================================================
--- gui/client/mail_delete.php (revision 2801)
+++ gui/client/mail_delete.php (working copy)
@@ -107,7 +107,7 @@
/**
* @todo useDB prepared statements
*/
-$query = "UPDATE `mail_users` SET `status` = '" . Config::get('ITEM_DELETE_STATUS') . "' WHERE `mail_id` = ?";
+$query = "UPDATE `mail_users` SET `status` = '" . Config::getInstance()->get('ITEM_DELETE_STATUS') . "' WHERE `mail_id` = ?";
exec_query($sql, $query, array($delete_id));
update_reseller_c_props(get_reseller_id($data['domain_id']));
Index: gui/client/mail_edit.php
===================================================================
--- gui/client/mail_edit.php (revision 2801)
+++ gui/client/mail_edit.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/mail_edit.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/mail_edit.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('normal_mail', 'page');
@@ -210,15 +210,15 @@
set_page_message(tr('Entered passwords differ!'));
return false;
} else if (!chk_password($pass, 50, "/[`\xb4'\"\\\\\x01-\x1f\015\012|<>^$]/i")) { // Not permitted chars
- if (Config::get('PASSWD_STRONG')) {
- set_page_message(sprintf(tr('The password must be at least %s long and contain letters and numbers to be valid.'), Config::get('PASSWD_CHARS')));
+ if (Config::getInstance()->get('PASSWD_STRONG')) {
+ set_page_message(sprintf(tr('The password must be at least %s long and contain letters and numbers to be valid.'), Config::getInstance()->get('PASSWD_CHARS')));
} else {
- set_page_message(sprintf(tr('Password data is shorter than %s signs or includes not permitted signs!'), Config::get('PASSWD_CHARS')));
+ set_page_message(sprintf(tr('Password data is shorter than %s signs or includes not permitted signs!'), Config::getInstance()->get('PASSWD_CHARS')));
}
return false;
} else {
$pass=encrypt_db_password($pass);
- $status = Config::get('ITEM_CHANGE_STATUS');
+ $status = Config::getInstance()->get('ITEM_CHANGE_STATUS');
$query = "UPDATE `mail_users` SET `mail_pass` = ?, `status` = ? WHERE `mail_id` = ?";
$rs = exec_query($sql, $query, array($pass, $status, $mail_id));
write_log($_SESSION['user_logged'] . ": change mail account password: $mail_account");
@@ -283,7 +283,7 @@
}
}
- $status = Config::get('ITEM_CHANGE_STATUS');
+ $status = Config::getInstance()->get('ITEM_CHANGE_STATUS');
$query = "UPDATE `mail_users` SET `mail_forward` = ?, `mail_type` = ?, `status` = ? WHERE `mail_id` = ?";
@@ -295,7 +295,7 @@
// end page functions.
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -318,8 +318,8 @@
// static page messages.
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_email_accounts.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_email_accounts.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_email_accounts.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_email_accounts.tpl');
gen_logged_from($tpl);
@@ -342,7 +342,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/client/password_change.php
===================================================================
--- gui/client/password_change.php (revision 2801)
+++ gui/client/password_change.php (working copy)
@@ -34,11 +34,11 @@
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/password_change.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/password_change.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -55,10 +55,10 @@
} else if ($_POST['pass'] !== $_POST['pass_rep']) {
set_page_message(tr('Passwords do not match!'));
} else if (!chk_password($_POST['pass'])) {
- if (Config::get('PASSWD_STRONG')) {
- set_page_message(sprintf(tr('The password must be at least %s long and contain letters and numbers to be valid.'), Config::get('PASSWD_CHARS')));
+ if (Config::getInstance()->get('PASSWD_STRONG')) {
+ set_page_message(sprintf(tr('The password must be at least %s long and contain letters and numbers to be valid.'), Config::getInstance()->get('PASSWD_CHARS')));
} else {
- set_page_message(sprintf(tr('Password data is shorter than %s signs or includes not permitted signs!'), Config::get('PASSWD_CHARS')));
+ set_page_message(sprintf(tr('Password data is shorter than %s signs or includes not permitted signs!'), Config::getInstance()->get('PASSWD_CHARS')));
}
} else if (!check_udata($_SESSION['user_id'], $_POST['curr_pass'])) {
set_page_message(tr('The current password is wrong!'));
@@ -108,8 +108,8 @@
* static page messages.
*
*/
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_general_information.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_general_information.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_general_information.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_general_information.tpl');
gen_logged_from($tpl);
@@ -136,7 +136,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/client/personal_change.php
===================================================================
--- gui/client/personal_change.php (revision 2801)
+++ gui/client/personal_change.php (working copy)
@@ -33,11 +33,11 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/personal_change.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/personal_change.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -146,8 +146,8 @@
*
*/
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_general_information.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_general_information.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_general_information.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_general_information.tpl');
gen_logged_from($tpl);
@@ -181,7 +181,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/client/protected_areas.php
===================================================================
--- gui/client/protected_areas.php (revision 2801)
+++ gui/client/protected_areas.php (working copy)
@@ -33,14 +33,14 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/protected_areas.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/protected_areas.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('dir_item', 'page');
$tpl->define_dynamic('action_link', 'page');
$tpl->define_dynamic('protected_areas', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -100,8 +100,8 @@
*
*/
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_webtools.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_webtools.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_webtools.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_webtools.tpl');
gen_logged_from($tpl);
@@ -138,7 +138,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/client/protected_areas_add.php
===================================================================
--- gui/client/protected_areas_add.php (revision 2801)
+++ gui/client/protected_areas_add.php (working copy)
@@ -36,14 +36,14 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/protect_it.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/protect_it.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('group_item', 'page');
$tpl->define_dynamic('user_item', 'page');
$tpl->define_dynamic('unprotect_it', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -159,8 +159,8 @@
SQL_QUERY;
$rs = exec_query($sql, $query, array($dmn_id, $path, $alt_path));
- $toadd_status = Config::get('ITEM_ADD_STATUS');
- $tochange_status = Config::get('ITEM_CHANGE_STATUS');
+ $toadd_status = Config::getInstance()->get('ITEM_ADD_STATUS');
+ $tochange_status = Config::getInstance()->get('ITEM_CHANGE_STATUS');
if ($rs->RecordCount() !== 0) {
$update_id = $rs->fields['id'];
@@ -238,7 +238,7 @@
$status = $rs->fields['status'];
$path = $rs->fields['path'];
$auth_name = $rs->fields['auth_name'];
- $ok_status = Config::get('ITEM_OK_STATUS');
+ $ok_status = Config::getInstance()->get('ITEM_OK_STATUS');
if ($status !== $ok_status) {
set_page_message(tr('Protected area status should be OK if you want to edit it!'));
user_goto('protected_areas.php');
@@ -382,8 +382,8 @@
*
*/
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_webtools.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_webtools.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_webtools.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_webtools.tpl');
gen_logged_from($tpl);
@@ -420,7 +420,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/client/protected_areas_delete.php
===================================================================
--- gui/client/protected_areas_delete.php (revision 2801)
+++ gui/client/protected_areas_delete.php (working copy)
@@ -39,7 +39,7 @@
if (isset($_GET['id']) && $_GET['id'] !== '') {
$id = $_GET['id'];
- $delete_status = Config::get('ITEM_DELETE_STATUS');
+ $delete_status = Config::getInstance()->get('ITEM_DELETE_STATUS');
$dmn_id = get_user_domain_id($sql, $_SESSION['user_id']);
// let's see the status of this thing
@@ -56,7 +56,7 @@
$rs = exec_query($sql, $query, array($id, $dmn_id));
$status = $rs->fields['status'];
- $ok_status = Config::get('ITEM_OK_STATUS');
+ $ok_status = Config::getInstance()->get('ITEM_OK_STATUS');
if ($status !== $ok_status) {
set_page_message(tr('Protected area status should be OK if you want to delete it!'));
user_goto('protected_areas.php');
Index: gui/client/protected_areas_remove.php
===================================================================
--- gui/client/protected_areas_remove.php (revision 2801)
+++ gui/client/protected_areas_remove.php (working copy)
@@ -41,7 +41,7 @@
$domain_name = $_SESSION['user_logged'];
$cdir = $_GET['cdir'];
-unlink(Config::get('FTP_HOMEDIR') . '/' . $domain_name . $cdir . '.htaccess');
+unlink(Config::getInstance()->get('FTP_HOMEDIR') . '/' . $domain_name . $cdir . '.htaccess');
set_page_message(tr('Protected area was deleted successful!'));
Index: gui/client/protected_group_add.php
===================================================================
--- gui/client/protected_group_add.php (revision 2801)
+++ gui/client/protected_group_add.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/puser_gadd.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/puser_gadd.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('usr_msg', 'page');
$tpl->define_dynamic('grp_msg', 'page');
@@ -41,7 +41,7 @@
$tpl->define_dynamic('pusres', 'page');
$tpl->define_dynamic('pgroups', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -77,7 +77,7 @@
$rs = exec_query($sql, $query, array($groupname, $dmn_id));
if ($rs->RecordCount() == 0) {
- $change_status = Config::get('ITEM_ADD_STATUS');
+ $change_status = Config::getInstance()->get('ITEM_ADD_STATUS');
$query = "
INSERT INTO `htaccess_groups`
@@ -112,8 +112,8 @@
*
*/
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_webtools.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_webtools.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_webtools.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_webtools.tpl');
gen_logged_from($tpl);
@@ -147,7 +147,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/client/protected_group_delete.php
===================================================================
--- gui/client/protected_group_delete.php (revision 2801)
+++ gui/client/protected_group_delete.php (working copy)
@@ -43,8 +43,8 @@
user_goto('protected_areas.php');
}
-$change_status = Config::get('ITEM_DELETE_STATUS');
-$awstats_auth = Config::get('AWSTATS_GROUP_AUTH');
+$change_status = Config::getInstance()->get('ITEM_DELETE_STATUS');
+$awstats_auth = Config::getInstance()->get('AWSTATS_GROUP_AUTH');
$query = "
UPDATE
@@ -84,10 +84,10 @@
if ($key !== false) {
unset($grp_id_splited[$key]);
if (count($grp_id_splited) == 0) {
- $status = Config::get('ITEM_DELETE_STATUS');
+ $status = Config::getInstance()->get('ITEM_DELETE_STATUS');
} else {
$grp_id = implode(",", $grp_id_splited);
- $status = Config::get('ITEM_CHANGE_STATUS');
+ $status = Config::getInstance()->get('ITEM_CHANGE_STATUS');
}
$update_query = "
UPDATE
Index: gui/client/protected_user_add.php
===================================================================
--- gui/client/protected_user_add.php (revision 2801)
+++ gui/client/protected_user_add.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/puser_uadd.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/puser_uadd.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('usr_msg', 'page');
$tpl->define_dynamic('grp_msg', 'page');
@@ -41,7 +41,7 @@
$tpl->define_dynamic('pusres', 'page');
$tpl->define_dynamic('pgroups', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -61,10 +61,10 @@
return;
}
if (!chk_password($_POST['pass'])) {
- if (Config::get('PASSWD_STRONG')) {
- set_page_message(sprintf(tr('The password must be at least %s long and contain letters and numbers to be valid.'), Config::get('PASSWD_CHARS')));
+ if (Config::getInstance()->get('PASSWD_STRONG')) {
+ set_page_message(sprintf(tr('The password must be at least %s long and contain letters and numbers to be valid.'), Config::getInstance()->get('PASSWD_CHARS')));
} else {
- set_page_message(sprintf(tr('Password data is shorter than %s signs or includes not permitted signs!'), Config::get('PASSWD_CHARS')));
+ set_page_message(sprintf(tr('Password data is shorter than %s signs or includes not permitted signs!'), Config::getInstance()->get('PASSWD_CHARS')));
}
return;
}
@@ -72,7 +72,7 @@
set_page_message(tr('Passwords do not match!'));
return;
}
- $status = Config::get('ITEM_ADD_STATUS');
+ $status = Config::getInstance()->get('ITEM_ADD_STATUS');
$uname = clean_input($_POST['username']);
@@ -121,8 +121,8 @@
*
*/
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_webtools.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_webtools.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_webtools.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_webtools.tpl');
gen_logged_from($tpl);
@@ -156,7 +156,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/client/protected_user_assign.php
===================================================================
--- gui/client/protected_user_assign.php (revision 2801)
+++ gui/client/protected_user_assign.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/puser_assign.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/puser_assign.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('already_in', 'page');
@@ -43,7 +43,7 @@
$tpl->define_dynamic('in_group', 'page');
$tpl->define_dynamic('not_in_group', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -190,7 +190,7 @@
$members = $members . "," . $uuser_id;
}
- $change_status = Config::get('ITEM_CHANGE_STATUS');
+ $change_status = Config::getInstance()->get('ITEM_CHANGE_STATUS');
$update_query = "
UPDATE
@@ -241,7 +241,7 @@
if ($key !== false) {
unset($members[$key]);
$members = implode(",", $members);
- $change_status = Config::get('ITEM_CHANGE_STATUS');
+ $change_status = Config::getInstance()->get('ITEM_CHANGE_STATUS');
$update_query = "
UPDATE
`htaccess_groups`
@@ -268,8 +268,8 @@
// ** end of funcfions
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_webtools.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_webtools.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_webtools.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_webtools.tpl');
gen_logged_from($tpl);
@@ -302,7 +302,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/client/protected_user_delete.php
===================================================================
--- gui/client/protected_user_delete.php (revision 2801)
+++ gui/client/protected_user_delete.php (working copy)
@@ -56,7 +56,7 @@
$rs = exec_query($sql, $query, array($dmn_id, $uuser_id));
$uname = $rs->fields['uname'];
-$change_status = Config::get('ITEM_DELETE_STATUS');
+$change_status = Config::getInstance()->get('ITEM_DELETE_STATUS');
// let's delete the user from the SQL
$query = "
UPDATE
@@ -92,7 +92,7 @@
if ($key !== false) {
unset($members[$key]);
$members = implode(",", $members);
- $change_status = Config::get('ITEM_CHANGE_STATUS');
+ $change_status = Config::getInstance()->get('ITEM_CHANGE_STATUS');
$update_query = "
UPDATE
`htaccess_groups`
@@ -130,10 +130,10 @@
if ($key !== false) {
unset($usr_id_splited[$key]);
if (count($usr_id_splited) == 0) {
- $status = Config::get('ITEM_DELETE_STATUS');
+ $status = Config::getInstance()->get('ITEM_DELETE_STATUS');
} else {
$usr_id = implode(",", $usr_id_splited);
- $status = Config::get('ITEM_CHANGE_STATUS');
+ $status = Config::getInstance()->get('ITEM_CHANGE_STATUS');
}
$update_query = "
UPDATE
Index: gui/client/protected_user_edit.php
===================================================================
--- gui/client/protected_user_edit.php (revision 2801)
+++ gui/client/protected_user_edit.php (working copy)
@@ -37,7 +37,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/puser_edit.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/puser_edit.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('usr_msg', 'page');
$tpl->define_dynamic('grp_msg', 'page');
@@ -45,7 +45,7 @@
$tpl->define_dynamic('pusres', 'page');
$tpl->define_dynamic('pgroups', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -61,10 +61,10 @@
// we have to add the user
if (isset($_POST['pass']) && isset($_POST['pass_rep'])) {
if (!chk_password($_POST['pass'])) {
- if (Config::get('PASSWD_STRONG')) {
- set_page_message(sprintf(tr('The password must be at least %s long and contain letters and numbers to be valid.'), Config::get('PASSWD_CHARS')));
+ if (Config::getInstance()->get('PASSWD_STRONG')) {
+ set_page_message(sprintf(tr('The password must be at least %s long and contain letters and numbers to be valid.'), Config::getInstance()->get('PASSWD_CHARS')));
} else {
- set_page_message(sprintf(tr('Password data is shorter than %s signs or includes not permitted signs!'), Config::get('PASSWD_CHARS')));
+ set_page_message(sprintf(tr('Password data is shorter than %s signs or includes not permitted signs!'), Config::getInstance()->get('PASSWD_CHARS')));
}
return;
}
@@ -75,7 +75,7 @@
$nadmin_password = crypt_user_pass_with_salt($_POST['pass']);
- $change_status = Config::get('ITEM_CHANGE_STATUS');
+ $change_status = Config::getInstance()->get('ITEM_CHANGE_STATUS');
$query = "
UPDATE
@@ -128,8 +128,8 @@
*
*/
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_webtools.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_webtools.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_webtools.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_webtools.tpl');
gen_logged_from($tpl);
@@ -231,7 +231,7 @@
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/client/protected_user_manage.php
===================================================================
--- gui/client/protected_user_manage.php (revision 2801)
+++ gui/client/protected_user_manage.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/puser_manage.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/puser_manage.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('usr_msg', 'page');
$tpl->define_dynamic('grp_msg', 'page');
@@ -42,7 +42,7 @@
$tpl->define_dynamic('pgroups', 'page');
$tpl->define_dynamic('group_members', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -54,7 +54,7 @@
);
function gen_user_action($id, $status) {
- if ($status === Config::get('ITEM_OK_STATUS')) {
+ if ($status === Config::getInstance()->get('ITEM_OK_STATUS')) {
return array(tr('Delete'), "action_delete('protected_user_delete.php?uname={USER_ID}', '{UNAME}')", tr('Edit'), "protected_user_edit.php?uname={USER_ID}");
} else {
return array(tr('N/A'), '', tr('N/A'), '#');
@@ -62,8 +62,8 @@
}
function gen_group_action($id, $status, $group) {
- if ($status === Config::get('ITEM_OK_STATUS')
- && $group != Config::get('AWSTATS_GROUP_AUTH')) {
+ if ($status === Config::getInstance()->get('ITEM_OK_STATUS')
+ && $group != Config::getInstance()->get('AWSTATS_GROUP_AUTH')) {
return array(tr('Delete'), "action_delete('protected_group_delete.php?gname={GROUP_ID}', '{GNAME}')");
} else {
return array(tr('N/A'), '');
@@ -188,8 +188,8 @@
*
*/
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_webtools.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_webtools.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_webtools.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_webtools.tpl');
gen_logged_from($tpl);
@@ -226,7 +226,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/client/sql_auth.php
===================================================================
--- gui/client/sql_auth.php (revision 2801)
+++ gui/client/sql_auth.php (working copy)
@@ -59,7 +59,7 @@
$rs = '';
- $fp = fsockopen(Config::get('BASE_SERVER_IP'), 80, $errno, $errstr, 5);
+ $fp = fsockopen(Config::getInstance()->get('BASE_SERVER_IP'), 80, $errno, $errstr, 5);
if (!$fp) {
auth_error();
} else {
Index: gui/client/sql_change_password.php
===================================================================
--- gui/client/sql_change_password.php (revision 2801)
+++ gui/client/sql_change_password.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/sql_change_password.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/sql_change_password.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
@@ -61,16 +61,16 @@
return;
}
- if (strlen($_POST['pass']) > Config::get('MAX_SQL_PASS_LENGTH')) {
+ if (strlen($_POST['pass']) > Config::getInstance()->get('MAX_SQL_PASS_LENGTH')) {
set_page_message(tr('Too long user password!'));
return;
}
if (!chk_password($_POST['pass'])) {
- if (Config::get('PASSWD_STRONG')) {
- set_page_message(sprintf(tr('The password must be at least %s long and contain letters and numbers to be valid.'), Config::get('PASSWD_CHARS')));
+ if (Config::getInstance()->get('PASSWD_STRONG')) {
+ set_page_message(sprintf(tr('The password must be at least %s long and contain letters and numbers to be valid.'), Config::getInstance()->get('PASSWD_CHARS')));
} else {
- set_page_message(sprintf(tr('Password data is shorter than %s signs or includes not permitted signs!'), Config::get('PASSWD_CHARS')));
+ set_page_message(sprintf(tr('Password data is shorter than %s signs or includes not permitted signs!'), Config::getInstance()->get('PASSWD_CHARS')));
}
return;
}
@@ -129,7 +129,7 @@
user_goto('index.php');
}
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -147,8 +147,8 @@
change_sql_user_pass($sql, $db_user_id, $db_user_name);
// static page messages.
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_manage_sql.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_manage_sql.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_manage_sql.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_manage_sql.tpl');
gen_logged_from($tpl);
@@ -171,7 +171,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/client/sql_database_add.php
===================================================================
--- gui/client/sql_database_add.php (revision 2801)
+++ gui/client/sql_database_add.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/sql_database_add.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/sql_database_add.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('mysql_prefix_no', 'page');
@@ -45,9 +45,9 @@
// page functions.
function gen_page_post_data(&$tpl) {
- if (Config::get('MYSQL_PREFIX') === 'yes') {
+ if (Config::getInstance()->get('MYSQL_PREFIX') === 'yes') {
$tpl->assign('MYSQL_PREFIX_YES', '');
- if (Config::get('MYSQL_PREFIX_TYPE') === 'behind') {
+ if (Config::getInstance()->get('MYSQL_PREFIX_TYPE') === 'behind') {
$tpl->assign('MYSQL_PREFIX_INFRONT', '');
$tpl->parse('MYSQL_PREFIX_BEHIND', 'mysql_prefix_behind');
$tpl->assign('MYSQL_PREFIX_ALL', '');
@@ -121,7 +121,7 @@
$db_name = clean_input($_POST['db_name']);
}
- if (strlen($db_name) > Config::get('MAX_SQL_DATABASE_LENGTH')) {
+ if (strlen($db_name) > Config::getInstance()->get('MAX_SQL_DATABASE_LENGTH')) {
set_page_message(tr('Database name is too long!'));
return;
}
@@ -199,7 +199,7 @@
}
}
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -218,8 +218,8 @@
add_sql_database($sql, $_SESSION['user_id']);
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_manage_sql.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_manage_sql.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_manage_sql.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_manage_sql.tpl');
gen_logged_from($tpl);
@@ -241,6 +241,6 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
Index: gui/client/sql_manage.php
===================================================================
--- gui/client/sql_manage.php (revision 2801)
+++ gui/client/sql_manage.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/sql_manage.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/sql_manage.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('db_list', 'page');
@@ -134,7 +134,7 @@
user_goto('index.php');
}
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
'TR_CLIENT_MANAGE_SQL_PAGE_TITLE' => tr('ispCP - Client/Manage SQL'),
@@ -150,8 +150,8 @@
// static page messages.
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_manage_sql.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_manage_sql.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_manage_sql.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_manage_sql.tpl');
gen_logged_from($tpl);
@@ -179,7 +179,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/client/sql_user_add.php
===================================================================
--- gui/client/sql_user_add.php (revision 2801)
+++ gui/client/sql_user_add.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/sql_user_add.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/sql_user_add.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('mysql_prefix_no', 'page');
@@ -235,7 +235,7 @@
}
if (isset($_POST['pass'])
- && strlen($_POST['pass']) > Config::get('MAX_SQL_PASS_LENGTH')
+ && strlen($_POST['pass']) > Config::getInstance()->get('MAX_SQL_PASS_LENGTH')
&& !isset($_POST['Add_Exist'])) {
set_page_message(tr('Too user long password!'));
return;
@@ -244,10 +244,10 @@
if (isset($_POST['pass'])
&& !chk_password($_POST['pass'])
&& !isset($_POST['Add_Exist'])) {
- if (Config::get('PASSWD_STRONG')) {
- set_page_message(sprintf(tr('The password must be at least %s long and contain letters and numbers to be valid.'), Config::get('PASSWD_CHARS')));
+ if (Config::getInstance()->get('PASSWD_STRONG')) {
+ set_page_message(sprintf(tr('The password must be at least %s long and contain letters and numbers to be valid.'), Config::getInstance()->get('PASSWD_CHARS')));
} else {
- set_page_message(sprintf(tr('Password data is shorter than %s signs or includes not permitted signs!'), Config::get('PASSWD_CHARS')));
+ set_page_message(sprintf(tr('Password data is shorter than %s signs or includes not permitted signs!'), Config::getInstance()->get('PASSWD_CHARS')));
}
return;
}
@@ -289,7 +289,7 @@
$db_user = $rs->fields['sqlu_name'];
}
- if (strlen($db_user) > Config::get('MAX_SQL_USER_LENGTH')) {
+ if (strlen($db_user) > Config::getInstance()->get('MAX_SQL_USER_LENGTH')) {
set_page_message(tr('User name too long!'));
return;
}
@@ -345,9 +345,9 @@
}
function gen_page_post_data(&$tpl, $db_id) {
- if (Config::get('MYSQL_PREFIX') === 'yes') {
+ if (Config::getInstance()->get('MYSQL_PREFIX') === 'yes') {
$tpl->assign('MYSQL_PREFIX_YES', '');
- if (Config::get('MYSQL_PREFIX_TYPE') === 'behind') {
+ if (Config::getInstance()->get('MYSQL_PREFIX_TYPE') === 'behind') {
$tpl->assign('MYSQL_PREFIX_INFRONT', '');
$tpl->parse('MYSQL_PREFIX_BEHIND', 'mysql_prefix_behind');
$tpl->assign('MYSQL_PREFIX_ALL', '');
@@ -392,7 +392,7 @@
user_goto('index.php');
}
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
'TR_CLIENT_SQL_ADD_USER_PAGE_TITLE' => tr('ispCP - Client/Add SQL User'),
@@ -411,8 +411,8 @@
// static page messages.
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_manage_sql.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_manage_sql.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_manage_sql.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_manage_sql.tpl');
gen_logged_from($tpl);
@@ -439,7 +439,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/client/subdomain_add.php
===================================================================
--- gui/client/subdomain_add.php (revision 2801)
+++ gui/client/subdomain_add.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/subdomain_add.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/subdomain_add.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('als_list', 'page');
@@ -111,7 +111,7 @@
}
function gen_dmn_als_list(&$tpl, &$sql, $dmn_id, $post_check) {
- $ok_status = Config::get('ITEM_OK_STATUS');
+ $ok_status = Config::getInstance()->get('ITEM_OK_STATUS');
$query = "
SELECT
@@ -281,7 +281,7 @@
}
function subdomain_schedule(&$sql, $user_id, $domain_id, $sub_name, $sub_mnt_pt) {
- $status_add = Config::get('ITEM_ADD_STATUS');
+ $status_add = Config::getInstance()->get('ITEM_ADD_STATUS');
if ($_POST['dmn_type'] == 'als') {
$query = "
@@ -404,7 +404,7 @@
header("Location: index.php");
}
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -423,8 +423,8 @@
// static page messages.
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_manage_domains.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_manage_domains.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_manage_domains.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_manage_domains.tpl');
gen_logged_from($tpl);
@@ -446,6 +446,6 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
Index: gui/client/ticket_closed.php
===================================================================
--- gui/client/ticket_closed.php (revision 2801)
+++ gui/client/ticket_closed.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/ticket_closed.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/ticket_closed.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('tickets_list', 'page');
@@ -47,7 +47,7 @@
function gen_tickets_list(&$tpl, &$sql, $user_id) {
$start_index = 0;
- $rows_per_page = Config::get('DOMAIN_ROWS_PER_PAGE');
+ $rows_per_page = Config::getInstance()->get('DOMAIN_ROWS_PER_PAGE');
if (isset($_GET['psi'])) $start_index = $_GET['psi'];
$count_query = <<get('USER_INITIAL_THEME');
$tpl->assign(
array(
'TR_CLIENT_QUESTION_PAGE_TITLE' => tr('ispCP - Client/Questions & Comments'),
@@ -175,7 +175,7 @@
$rs = exec_query($sql, $query, array($_SESSION['user_created_by']));
-if (!Config::get('ISPCP_SUPPORT_SYSTEM') || $rs->fields['support_system'] == 'no') {
+if (!Config::getInstance()->get('ISPCP_SUPPORT_SYSTEM') || $rs->fields['support_system'] == 'no') {
user_goto('index.php');
}
@@ -183,8 +183,8 @@
// static page messages.
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_ticket_system.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_ticket_system.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_ticket_system.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_ticket_system.tpl');
gen_logged_from($tpl);
@@ -213,7 +213,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/client/ticket_create.php
===================================================================
--- gui/client/ticket_create.php (revision 2801)
+++ gui/client/ticket_create.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/ticket_create.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/ticket_create.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
@@ -79,7 +79,7 @@
// common page data.
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -102,7 +102,7 @@
$rs = exec_query($sql, $query, array($_SESSION['user_created_by']));
-if (!Config::get('ISPCP_SUPPORT_SYSTEM') || $rs->fields['support_system'] == 'no') {
+if (!Config::getInstance()->get('ISPCP_SUPPORT_SYSTEM') || $rs->fields['support_system'] == 'no') {
user_goto('index.php');
}
@@ -110,8 +110,8 @@
// static page messages.
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_ticket_system.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_ticket_system.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_ticket_system.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_ticket_system.tpl');
gen_logged_from($tpl);
@@ -164,7 +164,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/client/ticket_delete.php
===================================================================
--- gui/client/ticket_delete.php (revision 2801)
+++ gui/client/ticket_delete.php (working copy)
@@ -43,7 +43,7 @@
$rs = exec_query($sql, $query, array($_SESSION['user_created_by']));
-if (!Config::get('ISPCP_SUPPORT_SYSTEM') || $rs->fields['support_system'] == 'no') {
+if (!Config::getInstance()->get('ISPCP_SUPPORT_SYSTEM') || $rs->fields['support_system'] == 'no') {
user_goto('index.php');
}
Index: gui/client/ticket_system.php
===================================================================
--- gui/client/ticket_system.php (revision 2801)
+++ gui/client/ticket_system.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/ticket_system.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/ticket_system.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('tickets_list', 'page');
@@ -47,7 +47,7 @@
function gen_tickets_list(&$tpl, &$sql, $user_id) {
$start_index = 0;
- $rows_per_page = Config::get('DOMAIN_ROWS_PER_PAGE');
+ $rows_per_page = Config::getInstance()->get('DOMAIN_ROWS_PER_PAGE');
if (isset($_GET['psi'])) $start_index = $_GET['psi'];
@@ -161,7 +161,7 @@
// common page data.
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
'TR_CLIENT_QUESTION_PAGE_TITLE' => tr('ispCP - Client/Questions & Comments'),
@@ -183,7 +183,7 @@
$rs = exec_query($sql, $query, array($_SESSION['user_created_by']));
-if (!Config::get('ISPCP_SUPPORT_SYSTEM') || $rs->fields['support_system'] == 'no') {
+if (!Config::getInstance()->get('ISPCP_SUPPORT_SYSTEM') || $rs->fields['support_system'] == 'no') {
user_goto('index.php');
}
@@ -191,8 +191,8 @@
// static page messages.
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_ticket_system.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_ticket_system.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_ticket_system.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_ticket_system.tpl');
gen_logged_from($tpl);
@@ -221,7 +221,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/client/ticket_view.php
===================================================================
--- gui/client/ticket_view.php (revision 2801)
+++ gui/client/ticket_view.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('CLIENT_TEMPLATE_PATH') . '/ticket_view.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/ticket_view.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('tickets_list', 'page');
@@ -80,7 +80,7 @@
'URGENCY_ID' => $ticket_urgency));
get_ticket_from($tpl, $sql, $ticket_id);
- $date_formt = Config::get('DATE_FORMAT');
+ $date_formt = Config::getInstance()->get('DATE_FORMAT');
$ticket_content = wordwrap($rs->fields['ticket_message'], round(($screenwidth-200) / 7), "\n");
$tpl->assign(
@@ -128,7 +128,7 @@
$ticket_message = $rs->fields['ticket_message'];
$ticket_content = wordwrap($ticket_message, round(($screenwidth-200) / 7), "\n");
- $date_formt = Config::get('DATE_FORMAT');
+ $date_formt = Config::getInstance()->get('DATE_FORMAT');
$tpl->assign(
array(
'DATE' => date($date_formt, $ticket_date),
@@ -184,7 +184,7 @@
// common page data.
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -342,7 +342,7 @@
$rs = exec_query($sql, $query, array($_SESSION['user_created_by']));
-if (!Config::get('ISPCP_SUPPORT_SYSTEM') || $rs->fields['support_system'] == 'no') {
+if (!Config::getInstance()->get('ISPCP_SUPPORT_SYSTEM') || $rs->fields['support_system'] == 'no') {
user_goto('index.php');
}
@@ -371,8 +371,8 @@
// static page messages.
-gen_client_mainmenu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_ticket_system.tpl');
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_ticket_system.tpl');
+gen_client_mainmenu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_ticket_system.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_ticket_system.tpl');
gen_logged_from($tpl);
@@ -396,6 +396,6 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
Index: gui/client/webtools.php
===================================================================
--- gui/client/webtools.php (revision 2801)
+++ gui/client/webtools.php (working copy)
@@ -35,14 +35,14 @@
$tpl = new pTemplate();
$tpl->define_dynamic(
'page',
- Config::get('CLIENT_TEMPLATE_PATH') . '/webtools.tpl'
+ Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/webtools.tpl'
);
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('active_awstats', 'page');
$tpl->define_dynamic('active_email', 'page');
$tpl->define_dynamic('logged_from', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -96,10 +96,10 @@
gen_client_mainmenu(
$tpl,
- Config::get('CLIENT_TEMPLATE_PATH') . '/main_menu_webtools.tpl'
+ Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/main_menu_webtools.tpl'
);
-gen_client_menu($tpl, Config::get('CLIENT_TEMPLATE_PATH') . '/menu_webtools.tpl');
+gen_client_menu($tpl, Config::getInstance()->get('CLIENT_TEMPLATE_PATH') . '/menu_webtools.tpl');
gen_logged_from($tpl);
@@ -124,7 +124,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/include/admin-functions.php
===================================================================
--- gui/include/admin-functions.php (revision 2801)
+++ gui/include/admin-functions.php (working copy)
@@ -76,8 +76,8 @@
'TR_MENU_SYSTEM_TOOLS' => tr('System tools'),
'TR_MENU_MANAGE_USERS' => tr('Manage users'),
'TR_MENU_STATISTICS' => tr('Statistics'),
- 'SUPPORT_SYSTEM_PATH' => Config::get('ISPCP_SUPPORT_SYSTEM_PATH'),
- 'SUPPORT_SYSTEM_TARGET' => Config::get('ISPCP_SUPPORT_SYSTEM_TARGET'),
+ 'SUPPORT_SYSTEM_PATH' => Config::getInstance()->get('ISPCP_SUPPORT_SYSTEM_PATH'),
+ 'SUPPORT_SYSTEM_TARGET' => Config::getInstance()->get('ISPCP_SUPPORT_SYSTEM_TARGET'),
'TR_MENU_SUPPORT_SYSTEM' => tr('Support system'),
'TR_MENU_SETTINGS' => tr('Settings'),
'TR_MENU_GENERAL_INFORMATION' => tr('General information'),
@@ -85,8 +85,8 @@
'TR_MENU_SYSTEM_TOOLS' => tr('System tools'),
'TR_MENU_MANAGE_USERS' => tr('Manage users'),
'TR_MENU_STATISTICS' => tr('Statistics'),
- 'SUPPORT_SYSTEM_PATH' => Config::get('ISPCP_SUPPORT_SYSTEM_PATH'),
- 'SUPPORT_SYSTEM_TARGET' => Config::get('ISPCP_SUPPORT_SYSTEM_TARGET'),
+ 'SUPPORT_SYSTEM_PATH' => Config::getInstance()->get('ISPCP_SUPPORT_SYSTEM_PATH'),
+ 'SUPPORT_SYSTEM_TARGET' => Config::getInstance()->get('ISPCP_SUPPORT_SYSTEM_TARGET'),
'TR_MENU_SUPPORT_SYSTEM' => tr('Support system'),
'TR_MENU_SETTINGS' => tr('Settings'),
'TR_MENU_CHANGE_PASSWORD' => tr('Change password'),
@@ -162,11 +162,11 @@
$i++;
} // end while
} // end else
- if (!Config::get('ISPCP_SUPPORT_SYSTEM')) {
+ if (!Config::getInstance()->get('ISPCP_SUPPORT_SYSTEM')) {
$tpl->assign('ISACTIVE_SUPPORT 84,56,240,162,130,71
ssign('SUPPORT_SYSTEM', '');
}
- if (strtolower(Config::get('HOSTING_PLANS_LEVEL')) != 'admin') {
+ if (strtolower(Config::getInstance()->get('HOSTING_PLANS_LEVEL')) != 'admin') {
$tpl->assign('HOSTING_PLANS', '');
}
@@ -316,7 +316,7 @@
// If COUNT_DEFAULT_EMAIL_ADDRESSES = false, admin total emails show [total - default_emails]/[total_emails]
$retrieve_total_emails = records_count('mail_users', 'mail_type NOT RLIKE \'_catchall\'', '');
- if (Config::get('COUNT_DEFAULT_EMAIL_ADDRESSES')) {
+ if (Config::getInstance()->get('COUNT_DEFAULT_EMAIL_ADDRESSES')) {
$show_total_emails = $retrieve_total_emails;
} else {
$retrieve_total_default_emails = records_count('mail_users', 'mail_acc', 'abuse');
@@ -392,7 +392,7 @@
if ($admin_created == 0) {
$admin_created = tr('N/A');
} else {
- $date_formt = Config::get('DATE_FORMAT');
+ $date_formt = Config::getInstance()->get('DATE_FORMAT');
$admin_created = date($date_formt, $admin_created);
}
@@ -504,7 +504,7 @@
if ($reseller_created == 0) {
$reseller_created = tr('N/A');
} else {
- $date_formt = Config::get('DATE_FORMAT');
+ $date_formt = Config::getInstance()->get('DATE_FORMAT');
$reseller_created = date($date_formt, $reseller_created);
}
@@ -531,7 +531,7 @@
function gen_user_list(&$tpl, &$sql) {
$start_index = 0;
- $rows_per_page = Config::get('DOMAIN_ROWS_PER_PAGE');
+ $rows_per_page = Config::getInstance()->get('DOMAIN_ROWS_PER_PAGE');
if (isset($_GET['psi'])) $start_index = $_GET['psi'];
// Search request generated ?!
@@ -699,13 +699,13 @@
$tpl->parse('USR_DELETE_LINK', 'usr_delete_link');
}
- if ($rs->fields['domain_status'] == Config::get('ITEM_OK_STATUS')) {
+ if ($rs->fields['domain_status'] == Config::getInstance()->get('ITEM_OK_STATUS')) {
$status_icon = "ok.png";
$status_url = "domain_status_change.php?domain_id=" . $rs->fields['domain_id'];
- } else if ($rs->fields['domain_status'] == Config::get('ITEM_DISABLED_STATUS')) {
+ } else if ($rs->fields['domain_status'] == Config::getInstance()->get('ITEM_DISABLED_STATUS')) {
$status_icon = "disabled.png";
$status_url = "domain_status_change.php?domain_id=" . $rs->fields['domain_id'];
- } else if ($rs->fields['domain_status'] == Config::get('ITEM_ADD_STATUS') || $rs->fields['domain_status'] == Config::get('ITEM_RESTORE_STATUS') || $rs->fields['domain_status'] == Config::get('ITEM_CHANGE_STATUS') || $rs->fields['domain_status'] == Config::get('ITEM_TOENABLE_STATUS') || $rs->fields['domain_status'] == Config::get('ITEM_TODISABLED_STATUS') || $rs->fields['domain_status'] == Config::get('ITEM_DELETE_STATUS')) {
+ } else if ($rs->fields['domain_status'] == Config::getInstance()->get('ITEM_ADD_STATUS') || $rs->fields['domain_status'] == Config::getInstance()->get('ITEM_RESTORE_STATUS') || $rs->fields['domain_status'] == Config::getInstance()->get('ITEM_CHANGE_STATUS') || $rs->fields['domain_status'] == Config::getInstance()->get('ITEM_TOENABLE_STATUS') || $rs->fields['domain_status'] == Config::getInstance()->get('ITEM_TODISABLED_STATUS') || $rs->fields['domain_status'] == Config::getInstance()->get('ITEM_DELETE_STATUS')) {
$status_icon = "reload.png";
$status_url = "#";
} else {
@@ -727,7 +727,7 @@
if ($domain_created == 0) {
$domain_created = tr('N/A');
} else {
- $date_formt = Config::get('DATE_FORMAT');
+ $date_formt = Config::getInstance()->get('DATE_FORMAT');
$domain_created = date($date_formt, $domain_created);
}
@@ -736,7 +736,7 @@
if ($domain_expires == 0) {
$domain_expires = tr('N/A');
} else {
- $date_formt = Config::get('DATE_FORMAT');
+ $date_formt = Config::getInstance()->get('DATE_FORMAT');
$domain_expires = date($date_formt, $domain_expires);
}
@@ -1001,7 +1001,7 @@
$als_current = records_count('domain_aliasses', 'domain_id', $user_id);
$als_max = $rs->fields['domain_alias_limit'];
//This works with the admin option(Count default E-Mail addresses) is working - TheCry
- if (Config::get('COUNT_DEFAULT_EMAIL_ADDRESSES')) {
+ if (Config::getInstance()->get('COUNT_DEFAULT_EMAIL_ADDRESSES')) {
$mail_current = records_count('mail_users', 'mail_type NOT RLIKE \'_catchall\' AND domain_id', $user_id);
} else {
$where = "`mail_acc` != 'abuse'
@@ -1312,7 +1312,7 @@
if ($rs->fields['admin_type'] == 'admin') {
return get_admin_logo($user_id);
} else {
- if(get_admin_logo($rs->fields['created_by']) === Config::get('IPS_LOGO_PATH').'/isp_logo.gif') {
+ if(get_admin_logo($rs->fields['created_by']) === Config::getInstance()->get('IPS_LOGO_PATH').'/isp_logo.gif') {
return get_admin_logo($user_id);
} else {
return get_admin_logo($rs->fields['created_by']);
@@ -1338,9 +1338,9 @@
$user_logo = $rs->fields['logo'];
if (empty($user_logo)) { // default logo
- return Config::get('IPS_LOGO_PATH') . '/isp_logo.gif';
+ return Config::getInstance()->get('IPS_LOGO_PATH') . '/isp_logo.gif';
} else {
- return Config::get('IPS_LOGO_PATH') . '/' . $user_logo;
+ return Config::getInstance()->get('IPS_LOGO_PATH') . '/' . $user_logo;
}
}
@@ -1376,17 +1376,17 @@
$msg = strip_tags(str_replace('
', "\n", $msg));
- $send_log_to = Config::get('DEFAULT_ADMIN_ADDRESS');
+ $send_log_to = Config::getInstance()->get('DEFAULT_ADMIN_ADDRESS');
// now send email if DEFAULT_ADMIN_ADDRESS != ''
- if ($send_log_to != '' && $level <= Config::get('LOG_LEVEL')) {
+ if ($send_log_to != '' && $level <= Config::getInstance()->get('LOG_LEVEL')) {
global $default_hostname, $default_base_server_ip, $Version, $BuildDate, $admin_login;
- $admin_email = Config::get('DEFAULT_ADMIN_ADDRESS');
- $default_hostname = Config::get('SERVER_HOSTNAME');
- $default_base_server_ip = Config::get('BASE_SERVER_IP');
- $Version = Config::get('Version');
- $BuildDate = Config::get('BuildDate');
+ $admin_email = Config::getInstance()->get('DEFAULT_ADMIN_ADDRESS');
+ $default_hostname = Config::getInstance()->get('SERVER_HOSTNAME');
+ $default_base_server_ip = Config::getInstance()->get('BASE_SERVER_IP');
+ $Version = Config::getInstance()->get('Version');
+ $BuildDate = Config::getInstance()->get('BuildDate');
$subject = "ispCP $Version on $default_hostname ($default_base_server_ip)";
@@ -1434,7 +1434,7 @@
$from_email = $data['sender_email'];
$message = $data['message'];
- $base_vhost = Config::get('BASE_SERVER_VHOST');
+ $base_vhost = Config::getInstance()->get('BASE_SERVER_VHOST');
if ($from_name) {
$from = '"' . encode($from_name) . "\" <" . $from_email . ">";
@@ -1468,7 +1468,7 @@
$search [] = '{BASE_SERVER_VHOST}';
$replace[] = $base_vhost;
$search [] = '{BASE_SERVER_VHOST_PREFIX}';
- $replace[] = Config::get('BASE_SERVER_VHOST_PREFIX');
+ $replace[] = Config::getInstance()->get('BASE_SERVER_VHOST_PREFIX');
$subject = str_replace($search, $replace, $subject);
$message = str_replace($search, $replace, $message);
@@ -1479,7 +1479,7 @@
$headers .= "MIME-Version: 1.0\nContent-Type: text/plain; charset=utf-8\nContent-Transfer-Encoding: 8bit\n";
- $headers .= "X-Mailer: ispCP " . Config::get('Version') . " Service Mailer";
+ $headers .= "X-Mailer: ispCP " . Config::getInstance()->get('Version') . " Service Mailer";
$mail_result = mail($to, $subject, $message, $headers);
@@ -1572,9 +1572,9 @@
function change_domain_status(&$sql, $domain_id, $domain_name, $action, $location) {
if ($action == 'disable') {
- $new_status = Config::get('ITEM_TODISABLED_STATUS');
+ $new_status = Config::getInstance()->get('ITEM_TODISABLED_STATUS');
} else if ($action == 'enable') {
- $new_status = Config::get('ITEM_TOENABLE_STATUS');
+ $new_status = Config::getInstance()->get('ITEM_TOENABLE_STATUS');
} else {
return;
}
@@ -1598,7 +1598,7 @@
$mail_pass = $rs->fields['mail_pass'];
$mail_type = $rs->fields['mail_type'];
- if (Config::get('HARD_MAIL_SUSPENSION')) {
+ if (Config::getInstance()->get('HARD_MAIL_SUSPENSION')) {
$mail_status = $new_status;
} else {
if ($action == 'disable') {
@@ -1624,7 +1624,7 @@
} else {
return;
}
- $mail_status = Config::get('ITEM_CHANGE_STATUS');
+ $mail_status = Config::getInstance()->get('ITEM_CHANGE_STATUS');
}
$query = "UPDATE `mail_users` SET `mail_pass` = ?, `status` = ? WHERE `mail_id` = ?";
@@ -1904,12 +1904,12 @@
$rs = exec_query($sql, $query, array($domain_gid));
// let's delete all subdomains for this user
- $delete_status = Config::get('ITEM_DELETE_STATUS');
+ $delete_status = Config::getInstance()->get('ITEM_DELETE_STATUS');
$query = "UPDATE `subdomain` SET `subdomain_status` = ? WHERE `domain_id` = ?";
$rs = exec_query($sql, $query, array($delete_status, $domain_id));
// let's delete all alises subdomains for this user
- $delete_status = Config::get('ITEM_DELETE_STATUS');
+ $delete_status = Config::getInstance()->get('ITEM_DELETE_STATUS');
$query = "UPDATE `subdomain_alias` SET `subdomain_alias_status` = ? WHERE `alias_id` IN (SELECT `alias_id` FROM `domain_aliasses` WHERE `domain_id` = ?)";
$rs = exec_query($sql, $query, array($delete_status, $domain_id));
@@ -2060,7 +2060,7 @@
if (isset($_SESSION['user_theme'])) {
$theme = $_SESSION['user_theme'];
} else {
- $theme = Config::get('USER_INITIAL_THEME');
+ $theme = Config::getInstance()->get('USER_INITIAL_THEME');
}
$rs = exec_query($sql, $query, array($user_id));
@@ -2126,7 +2126,7 @@
$res = exec_query($sql, $query, array($value, $name));
}
- Config::set($name, $value);
+ Config::getInstance()->set($name, $value);
return true;
}
Index: gui/include/calc-functions.php
===================================================================
--- gui/include/calc-functions.php (revision 2801)
+++ gui/include/calc-functions.php (working copy)
@@ -170,7 +170,7 @@
$pw = '';
- for ($i = 0, $passwd_chars = Config::get('PASSWD_CHARS'); $i <= $passwd_chars; $i++) {
+ for ($i = 0, $passwd_chars = Config::getInstance()->get('PASSWD_CHARS'); $i <= $passwd_chars; $i++) {
$z = 0;
do {
Index: gui/include/class.Config.php
===================================================================
--- gui/include/class.Config.php (revision 2801)
+++ gui/include/class.Config.php (working copy)
@@ -32,58 +32,66 @@
* @version 2.0
* @since r154
*/
-final class Config {
-
+class Config {
+ private static $config;
+
+ public static function getInstance() {
+ if(!self::$config) {
+ self::$config = new ConfigHandler();
+ }
+ return self::$config;
+ }
+}
+
+class ConfigHandler {
/**
* Config filename.
*
* @var String file name
*/
- private static $_file;
-
+ private $file;
+
/**
* Array with all options parsed from config file.
*
* @var Array key - value pair
*/
- private static $_values = array();
+ private $values;
/**
- * Set to true if class is inizialized
- *
- * @var boolean Status
- */
- private static $_status = false;
-
- /**
* Loads the ispCP config file (default directory: /etc/ispcp/ispcp.conf)
*
* @param String $cfg path to ispcp.conf
*/
- public static function load($cfg = '/etc/ispcp/ispcp.conf') {
- self::$_file = $cfg;
-
- if (self::$_status === false) {
- if (!self::_parseFile()) {
- throw new Exception('Cannot open the ispcp.conf config file!');
- }
+ public function __construct() {
+ switch (PHP_OS) {
+ case 'FreeBSD':
+ case 'OpenBSD':
+ case 'NetBSD':
+ $path = '/usr/local/etc/ispcp/ispcp.conf';
+ break;
+
+ default:
+ $path = '/etc/ispcp/ispcp.conf';
+ break;
}
-
- self::$_status = true;
+ $this->file = $path;
+
+ if (!$self->parseFile()) {
+ throw new Exception('Cannot open the ispcp.conf config file!');
+ }
}
/**
*
* @param unknown_type $param
*/
- public static function get($param) {
- if (!isset(self::$_values[$param]))
+ public function get($param) {
+ if (!$this->exists($param)) {
throw new Exception("Config variable '".$param."' is missing!");
+ }
- if (!self::$_status)
- throw new Exception('Config not loaded!');
-
- return self::$_values[$param];
+ return $self->values[$param];
}
/**
@@ -91,8 +99,8 @@
* @param unknown_type $param
* @param unknown_type $value
*/
- public static function set($param, $value) {
- self::$_values[$param] = $value;
+ public function set($param, $value) {
+ $this->values[$param] = $value;
}
/**
@@ -101,8 +109,8 @@
* @param String $param
* @return boolean
*/
- public static function exists($param) {
- return isset(self::$_values[$param]);
+ public function exists($param) {
+ return isset($self->values[$param]);
}
/**
@@ -111,19 +119,18 @@
*
* @return boolean true on success
*/
- private static function _parseFile() {
- $fd = file_get_contents(self::$_file);
+ private function parseFile() {
+ $fd = @file_get_contents($this->file);
if ($fd === false) {
return false;
}
$lines = explode("\n", $fd);
foreach ($lines as $line) {
- trim($line);
if (!empty($line) && $line[0] != '#' && strpos($line, '=')) {
list($key, $value) = explode('=', $line, 2);
- self::$_values[trim($key)] = trim($value);
+ $this->values[trim($key)] = trim($value);
}
}
Index: gui/include/class.criticalUpdate.php
===================================================================
--- gui/include/class.criticalUpdate.php (revision 2801)
+++ gui/include/class.criticalUpdate.php (working copy)
@@ -88,7 +88,7 @@
*/
protected function _criticalUpdate_1(&$engine_run_request) {
- $status = Config::get('ITEM_CHANGE_STATUS');
+ $status = Config::getInstance()->get('ITEM_CHANGE_STATUS');
$sql = Database::getInstance();
setConfig_Value('CRITICAL_UPDATE_REVISION', 1);
@@ -135,8 +135,8 @@
$sqlUpd = array();
- $status = Config::get('ITEM_ADD_STATUS');
- $statsgroup = Config::get('AWSTATS_GROUP_AUTH');
+ $status = Config::getInstance()->get('ITEM_ADD_STATUS');
+ $statsgroup = Config::getInstance()->get('AWSTATS_GROUP_AUTH');
$sql = Database::getInstance();
$query = "SELECT `domain_id` FROM `domain` WHERE `domain_id` NOT IN (SELECT `dmn_id` FROM `htaccess_groups` WHERE `ugroup` = '{$statsgroup}')";
@@ -171,13 +171,13 @@
$sql = Database::getInstance();
$interfaces=new networkCard();
- $card = $interfaces->ip2NetworkCard(Config::get('BASE_SERVER_IP'));
+ $card = $interfaces->ip2NetworkCard(Config::getInstance()->get('BASE_SERVER_IP'));
$sqlUpd[] = "ALTER TABLE `server_ips`
ADD `ip_card` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL,
ADD `ip_ssl_domain_id` INT( 10 ) NULL,
ADD `ip_status` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL";
- $sqlUpd[] = "UPDATE `server_ips` SET `ip_card` = '" . $card . "', `ip_status` = '" . Config::get('ITEM_CHANGE_STATUS') . "'";
+ $sqlUpd[] = "UPDATE `server_ips` SET `ip_card` = '" . $card . "', `ip_status` = '" . Config::getInstance()->get('ITEM_CHANGE_STATUS') . "'";
$engine_run_request = true;
return $sqlUpd;
Index: gui/include/class.ispcpUpdate.php
===================================================================
--- gui/include/class.ispcpUpdate.php (revision 2801)
+++ gui/include/class.ispcpUpdate.php (working copy)
@@ -200,7 +200,7 @@
$errorMessage = tr($this->errorMessage, $newVersion);
// Extended error message
- if (Config::get('DEBUG')) {
+ if (Config::getInstance()->get('DEBUG')) {
$errorMessage .= "
" . $e->getMessage();
$errorMessage .= "
Sql Statement was failed: $query";
}
Index: gui/include/class.networkCard.php
===================================================================
--- gui/include/class.networkCard.php (revision 2801)
+++ gui/include/class.networkCard.php (working copy)
@@ -93,7 +93,7 @@
private function _populateInterfaces() {
$err = '';
- $message = $this->executeExternal(config::Get('CMD_IFCONFIG'), $err);
+ $message = $this->executeExternal(Config::getInstance()->Get('CMD_IFCONFIG'), $err);
if (!$message) {
$this->errors .= tr("Error while trying to obtain list of network cards!") . $err;
Index: gui/include/class.SystemInfo.php
===================================================================
--- gui/include/class.SystemInfo.php (revision 2801)
+++ gui/include/class.SystemInfo.php (working copy)
@@ -244,7 +244,7 @@
// 10.0.100.10:/path/to/mount/point
// 976428116 150249136 826178980 16% /var/www/virtual//htdocs/data
// if solved, we can savely remove l-argument
- $proc = proc_open(Config::get('CMD_DF') . ' -Tl', $descriptorspec, $pipes);
+ $proc = proc_open(Config::getInstance()->get('CMD_DF') . ' -Tl', $descriptorspec, $pipes);
if (is_resource($proc)) {
// Read data from stream (Pipe 1)
$fs_raw = stream_get_contents($pipes[1]);
@@ -356,7 +356,7 @@
2 => array('pipe', 'a') // stderr is a pipe that he cild will write to
);
- $proc = proc_open(Config::get('CMD_VMSTAT'), $descriptorspec, $pipes);
+ $proc = proc_open(Config::getInstance()->get('CMD_VMSTAT'), $descriptorspec, $pipes);
if (is_resource($proc)) {
// Read data from stream (Pipe 1)
$raw = stream_get_contents($pipes[1]);
@@ -423,7 +423,7 @@
}
$proc = proc_open(
- Config::get('CMD_SWAPCTL') . $args,
+ Config::getInstance()->get('CMD_SWAPCTL') . $args,
$descriptorspec,
$pipes
);
@@ -571,7 +571,7 @@
2 => array('pipe', 'a') // stderr is a pipe that he cild will write to
);
- $proc = proc_open(Config::get('CMD_SYSCTL') . ' -n ' . $args,
+ $proc = proc_open(Config::getInstance()->get('CMD_SYSCTL') . ' -n ' . $args,
$descriptorspec, $pipes);
if (is_resource($proc)) {
// Read data from stream (Pipe 1)
Index: gui/include/class.versionUpdate.php
===================================================================
--- gui/include/class.versionUpdate.php (revision 2801)
+++ gui/include/class.versionUpdate.php (working copy)
@@ -62,7 +62,7 @@
* @todo Please descibe this method!
*/
protected function getCurrentVersion() {
- return (int)Config::get('BuildDate');
+ return (int)Config::getInstance()->get('BuildDate');
}
/**
Index: gui/include/class.vfs.php
===================================================================
--- gui/include/class.vfs.php (revision 2801)
+++ gui/include/class.vfs.php (working copy)
@@ -89,7 +89,7 @@
$this->_db = &$db;
if (!defined("VFS_TMP_DIR")) {
- define("VFS_TMP_DIR", Config::get('GUI_ROOT_DIR') . '/phptmp');
+ define("VFS_TMP_DIR", Config::getInstance()->get('GUI_ROOT_DIR') . '/phptmp');
}
$_ENV['PHP_TMPDIR'] = VFS_TMP_DIR;
$_ENV['TMPDIR'] = VFS_TMP_DIR;
@@ -143,7 +143,7 @@
VALUES
(?, ?, ?, ?, ?, ?);";
$rs = exec_query($this->_db, $query, array($user, $passwd, $rs->fields['domain_uid'], $rs->fields['domain_gid'],
- Config::get('CMD_SHELL'), Config::get('FTP_HOMEDIR') . '/' . $this->_domain
+ Config::getInstance()->get('CMD_SHELL'), Config::getInstance()->get('FTP_HOMEDIR') . '/' . $this->_domain
));
if (!$rs) {
return false;
Index: gui/include/client-functions.php
===================================================================
--- gui/include/client-functions.php (revision 2801)
+++ gui/include/client-functions.php (working copy)
@@ -205,7 +205,7 @@
`domain_id` = ?
";
- if (Config::get('COUNT_DEFAULT_EMAIL_ADDRESSES') == 0) {
+ if (Config::getInstance()->get('COUNT_DEFAULT_EMAIL_ADDRESSES') == 0) {
$qr_dmn .= "
AND
`mail_acc` != 'abuse'
@@ -270,7 +270,7 @@
function get_domain_running_dmn_ftp_acc_cnt(&$sql, $domain_id) {
- $ftp_separator = Config::get('FTP_USERNAME_SEPARATOR');
+ $ftp_separator = Config::getInstance()->get('FTP_USERNAME_SEPARATOR');
$query = "
SELECT
@@ -304,7 +304,7 @@
function get_domain_running_sub_ftp_acc_cnt(&$sql, $domain_id) {
- $ftp_separator = Config::get('FTP_USERNAME_SEPARATOR');
+ $ftp_separator = Config::getInstance()->get('FTP_USERNAME_SEPARATOR');
$query = "
SELECT
@@ -358,7 +358,7 @@
function get_domain_running_als_ftp_acc_cnt(&$sql, $domain_id) {
- $ftp_separator = Config::get('FTP_USERNAME_SEPARATOR');
+ $ftp_separator = Config::getInstance()->get('FTP_USERNAME_SEPARATOR');
$query = "
SELECT
@@ -518,14 +518,14 @@
'TR_MENU_CATCH_ALL_MAIL' => tr('Catch all'),
'TR_MENU_ADD_ALIAS' => tr('Add alias'),
'TR_MENU_UPDATE_HP' => tr('Update Hosting Package'),
- 'SUPPORT_SYSTEM_PATH' => Config::get('ISPCP_SUPPORT_SYSTEM_PATH'),
- 'SUPPORT_SYSTEM_TARGET' => Config::get('ISPCP_SUPPORT_SYSTEM_TARGET'),
- 'WEBMAIL_PATH' => Config::get('WEBMAIL_PATH'),
- 'WEBMAIL_TARGET' => Config::get('WEBMAIL_TARGET'),
- 'PMA_PATH' => Config::get('PMA_PATH'),
- 'PMA_TARGET' => Config::get('PMA_TARGET'),
- 'FILEMANAGER_PATH' => Config::get('FILEMANAGER_PATH'),
- 'FILEMANAGER_TARGET' => Config::get('FILEMANAGER_TARGET'),
+ 'SUPPORT_SYSTEM_PATH' => Config::getInstance()->get('ISPCP_SUPPORT_SYSTEM_PATH'),
+ 'SUPPORT_SYSTEM_TARGET' => Config::getInstance()->get('ISPCP_SUPPORT_SYSTEM_TARGET'),
+ 'WEBMAIL_PATH' => Config::getInstance()->get('WEBMAIL_PATH'),
+ 'WEBMAIL_TARGET' => Config::getInstance()->get('WEBMAIL_TARGET'),
+ 'PMA_PATH' => Config::getInstance()->get('PMA_PATH'),
+ 'PMA_TARGET' => Config::getInstance()->get('PMA_TARGET'),
+ 'FILEMANAGER_PATH' => Config::getInstance()->get('FILEMANAGER_PATH'),
+ 'FILEMANAGER_TARGET' => Config::getInstance()->get('FILEMANAGER_TARGET'),
'TR_MENU_ADD_DNS' => tr("Add DNS zone's record"),
'TR_MENU_SSL_MANAGE' => tr('Manage SSL certificate')
)
@@ -626,11 +626,11 @@
$rs = exec_query($sql, $query, array($_SESSION['user_created_by']));
- if (!Config::get('ISPCP_SUPPORT_SYSTEM') || $rs->fields['support_system'] == 'no') {
+ if (!Config::getInstance()->get('ISPCP_SUPPORT_SYSTEM') || $rs->fields['support_system'] == 'no') {
$tpl->assign('ISACTIVE_SUPPORT', '');
}
- if (Config::get('AWSTATS_ACTIVE') == 'no') {
+ if (Config::getInstance()->get('AWSTATS_ACTIVE') == 'no') {
$tpl->assign('ISACTIVE_AWSTATS', '');
} else {
$tpl->assign(
@@ -687,17 +687,17 @@
'TR_MENU_CATCH_ALL_MAIL' => tr('Catch all'),
'TR_MENU_ADD_ALIAS' => tr('Add alias'),
'TR_MENU_UPDATE_HP' => tr('Update Hosting Package'),
- 'SUPPORT_SYSTEM_PATH' => Config::get('ISPCP_SUPPORT_SYSTEM_PATH'),
- 'SUPPORT_SYSTEM_TARGET' => Config::get('ISPCP_SUPPORT_SYSTEM_TARGET'),
- 'WEBMAIL_PATH' => Config::get('WEBMAIL_PATH'),
- 'WEBMAIL_TARGET' => Config::get('WEBMAIL_TARGET'),
- 'PMA_PATH' => Config::get('PMA_PATH'),
- 'PMA_TARGET' => Config::get('PMA_TARGET'),
- 'FILEMANAGER_PATH' => Config::get('FILEMANAGER_PATH'),
- 'FILEMANAGER_TARGET' => Config::get('FILEMANAGER_TARGET'),
- 'VERSION' => Config::get('Version'),
- 'BUILDDATE' => Config::get('BuildDate'),
- 'CODENAME' => Config::get('CodeName')
+ 'SUPPORT_SYSTEM_PATH' => Config::getInstance()->get('ISPCP_SUPPORT_SYSTEM_PATH'),
+ 'SUPPORT_SYSTEM_TARGET' => Config::getInstance()->get('ISPCP_SUPPORT_SYSTEM_TARGET'),
+ 'WEBMAIL_PATH' => Config::getInstance()->get('WEBMAIL_PATH'),
+ 'WEBMAIL_TARGET' => Config::getInstance()->get('WEBMAIL_TARGET'),
+ 'PMA_PATH' => Config::getInstance()->get('PMA_PATH'),
+ 'PMA_TARGET' => Config::getInstance()->get('PMA_TARGET'),
+ 'FILEMANAGER_PATH' => Config::getInstance()->get('FILEMANAGER_PATH'),
+ 'FILEMANAGER_TARGET' => Config::getInstance()->get('FILEMANAGER_TARGET'),
+ 'VERSION' => Config::getInstance()->get('Version'),
+ 'BUILDDATE' => Config::getInstance()->get('BuildDate'),
+ 'CODENAME' => Config::getInstance()->get('CodeName')
)
);
@@ -757,7 +757,7 @@
$rs = exec_query($sql, $query, array($_SESSION['user_created_by']));
- if (!Config::get('ISPCP_SUPPORT_SYSTEM') || $rs->fields['support_system'] == 'no') {
+ if (!Config::getInstance()->get('ISPCP_SUPPORT_SYSTEM') || $rs->fields['support_system'] == 'no') {
$tpl->assign('SUPPORT_SYSTEM', '');
}
@@ -817,7 +817,7 @@
$tpl->assign('ISACTIVE_ALIAS_MENU', '');
}
- if (Config::get('AWSTATS_ACTIVE') != 'yes') {
+ if (Config::getInstance()->get('AWSTATS_ACTIVE') != 'yes') {
$tpl->assign('ACTIVE_AWSTATS', '');
} else {
$tpl->assign(
@@ -844,7 +844,7 @@
$rs = exec_query($sql, $query, array($_SESSION['user_created_by']));
if ($rs->RecordCount() == 0) {
- if (Config::get('HOSTING_PLANS_LEVEL') != 'admin') {
+ if (Config::getInstance()->get('HOSTING_PLANS_LEVEL') != 'admin') {
$tpl->assign('ISACTIVE_UPDATE_HP', '');
}
}
Index: gui/include/functions.ticket_system.php
===================================================================
--- gui/include/functions.ticket_system.php (revision 2801)
+++ gui/include/functions.ticket_system.php (working copy)
@@ -57,7 +57,7 @@
$rs = exec_query($sql, $query, array($ticket_id, $ticket_id));
- $date_formt = Config::get('DATE_FORMAT');
+ $date_formt = Config::getInstance()->get('DATE_FORMAT');
return date($date_formt, $rs->fields['ticket_date']); // last date
}
@@ -104,7 +104,7 @@
}
$message .= "\n".tr("Priority: %s\n", "{PRIORITY}");
$message .= "\n" . $ticket_message;
- $message .= "\n\n" . tr("Log in to answer") . ' ' . Config::get('BASE_SERVER_VHOST_PREFIX') . Config::get('BASE_SERVER_VHOST');
+ $message .= "\n\n" . tr("Log in to answer") . ' ' . Config::getInstance()->get('BASE_SERVER_VHOST_PREFIX') . Config::getInstance()->get('BASE_SERVER_VHOST');
// Format addresses
if ($from_fname && $from_lname) {
@@ -145,7 +145,7 @@
$headers .= "MIME-Version: 1.0\nContent-Type: text/plain; charset=utf-8\nContent-Transfer-Encoding: 8bit\n";
- $headers .= "X-Mailer: ispCP " . Config::get('Version') . " Tickets Mailer";
+ $headers .= "X-Mailer: ispCP " . Config::getInstance()->get('Version') . " Tickets Mailer";
$mail_result = mail($to, encode($subject), $message, $headers);
$mail_status = ($mail_result) ? 'OK' : 'NOT OK';
Index: gui/include/i18n.php
===================================================================
--- gui/include/i18n.php (revision 2801)
+++ gui/include/i18n.php (working copy)
@@ -52,7 +52,7 @@
) {
$newlang = (isset($_SESSION['user_def_lang']))
? $_SESSION['user_def_lang']
- : Config::get('USER_INITIAL_LANG');
+ : Config::getInstance()->get('USER_INITIAL_LANG');
}
if ($newlang !== false) {
Index: gui/include/input-checks.php
===================================================================
--- gui/include/input-checks.php (revision 2801)
+++ gui/include/input-checks.php (working copy)
@@ -173,7 +173,7 @@
}
$len = strlen($password);
- if ($len < Config::get('PASSWD_CHARS') || $len > $num) {
+ if ($len < Config::getInstance()->getInstance()->get('PASSWD_CHARS') || $len > $num) {
return false;
}
@@ -181,7 +181,7 @@
return false;
}
- if (Config::get('PASSWD_STRONG')) {
+ if (Config::getInstance()->getInstance()->get('PASSWD_STRONG')) {
return (bool)(preg_match("/[0-9]/", $password)
&& preg_match("/[a-zA-Z]/", $password));
} else {
@@ -333,7 +333,7 @@
global $validation_err_msg;
$validation_err_msg = tr('Wrong domain name syntax or number of labels');
- $max_labels = ($subdname_process) ? 99 : config::get('MAX_DNAMES_LABELS');
+ $max_labels = ($subdname_process) ? 99 : Config::getInstance()->getInstance()->get('MAX_DNAMES_LABELS');
if(!$subdname_process) {
@@ -411,7 +411,7 @@
$dname_nb_labels = count(explode('.', $dname)) -1;
// Retrieves the maximum number of labels for the subdomain
- $subdname_nb_labels = Config::get('MAX_SUBDNAMES_LABELS');
+ $subdname_nb_labels = Config::getInstance()->getInstance()->get('MAX_SUBDNAMES_LABELS');
$matches = array();
@@ -528,7 +528,7 @@
$matches = array();
- if(Config::get('TLD_STRICT_VALIDATION')) {
+ if(Config::getInstance()->getInstance()->get('TLD_STRICT_VALIDATION')) {
// This pattern Matches only Top Level Domain listed in Iana root database
// ( only ccTLDs and gTLDs, not IDNs )
@@ -610,7 +610,7 @@
global $validation_err_msg;
- if(Config::get('SLD_STRICT_VALIDATION')) {
+ if(Config::getInstance()->getInstance()->get('SLD_STRICT_VALIDATION')) {
// Single-Character SLD
// Note: All another SC SLD are presently reserved in
Index: gui/include/ispcp-functions.php
===================================================================
--- gui/include/ispcp-functions.php (revision 2801)
+++ gui/include/ispcp-functions.php (working copy)
@@ -33,7 +33,7 @@
*/
function check_for_lock_file() {
- $fh = fopen(Config::get('MR_LOCK_FILE'),'r');
+ $fh = fopen(Config::getInstance()->get('MR_LOCK_FILE'),'r');
if (!$fh) {
return false;
}
@@ -200,7 +200,7 @@
// mama mia, we have to rebuild the system entry for this domain
// and also all domain alias and subdomains
- $update_status = Config::get('ITEM_CHANGE_STATUS');
+ $update_status = Config::getInstance()->get('ITEM_CHANGE_STATUS');
// check if we have to wait some system update
check_for_lock_file();
Index: gui/include/ispcp-lib.php
===================================================================
--- gui/include/ispcp-lib.php (revision 2801)
+++ gui/include/ispcp-lib.php (working copy)
@@ -51,17 +51,17 @@
require_once(INCLUDEPATH . '/i18n.php');
// Template pathes
-Config::set('ROOT_TEMPLATE_PATH', 'themes/');
-Config::set('USER_INITIAL_THEME', 'omega_original');
-Config::set('LOGIN_TEMPLATE_PATH', Config::get('ROOT_TEMPLATE_PATH') . Config::get('USER_INITIAL_THEME'));
-Config::set('ADMIN_TEMPLATE_PATH', '../' . Config::get('ROOT_TEMPLATE_PATH') . Config::get('USER_INITIAL_THEME') . '/admin');
-Config::set('RESELLER_TEMPLATE_PATH', '../' . Config::get('ROOT_TEMPLATE_PATH') . Config::get('USER_INITIAL_THEME') . '/reseller');
-Config::set('CLIENT_TEMPLATE_PATH', '../' . Config::get('ROOT_TEMPLATE_PATH') . Config::get('USER_INITIAL_THEME') . '/client');
-Config::set('IPS_LOGO_PATH', '../themes/user_logos');
-Config::set('PURCHASE_TEMPLATE_PATH', '../' . Config::get('ROOT_TEMPLATE_PATH') . Config::get('USER_INITIAL_THEME') . '/orderpanel');
+Config::getInstance()->set('ROOT_TEMPLATE_PATH', 'themes/');
+Config::getInstance()->set('USER_INITIAL_THEME', 'omega_original');
+Config::getInstance()->set('LOGIN_TEMPLATE_PATH', Config::getInstance()->get('ROOT_TEMPLATE_PATH') . Config::getInstance()->get('USER_INITIAL_THEME'));
+Config::getInstance()->set('ADMIN_TEMPLATE_PATH', '../' . Config::getInstance()->get('ROOT_TEMPLATE_PATH') . Config::getInstance()->get('USER_INITIAL_THEME') . '/admin');
+Config::getInstance()->set('RESELLER_TEMPLATE_PATH', '../' . Config::getInstance()->get('ROOT_TEMPLATE_PATH') . Config::getInstance()->get('USER_INITIAL_THEME') . '/reseller');
+Config::getInstance()->set('CLIENT_TEMPLATE_PATH', '../' . Config::getInstance()->get('ROOT_TEMPLATE_PATH') . Config::getInstance()->get('USER_INITIAL_THEME') . '/client');
+Config::getInstance()->set('IPS_LOGO_PATH', '../themes/user_logos');
+Config::getInstance()->set('PURCHASE_TEMPLATE_PATH', '../' . Config::getInstance()->get('ROOT_TEMPLATE_PATH') . Config::getInstance()->get('USER_INITIAL_THEME') . '/orderpanel');
// Standard Language (if not set)
-Config::set('USER_INITIAL_LANG', 'lang_EnglishBritain');
+Config::getInstance()->set('USER_INITIAL_LANG', 'lang_EnglishBritain');
require_once(INCLUDEPATH . '/system-message.php');
require_once(INCLUDEPATH . '/ispcp-db-keys.php');
@@ -70,76 +70,76 @@
// variable for development edition => shows all php variables under the pages
// false = disable, true = enable
-Config::set('DUMP_GUI_DEBUG', false);
+Config::getInstance()->set('DUMP_GUI_DEBUG', false);
// show extra (server load) information in HTML as comment
// will get overwritten by db config table entry
// (true = show, false = hide)
-Config::set('SHOW_SERVERLOAD', true);
+Config::getInstance()->set('SHOW_SERVERLOAD', true);
// session timeout in minutes
-Config::set('SESSION_TIMEOUT', 30);
+Config::getInstance()->set('SESSION_TIMEOUT', 30);
// Item states
-Config::set('ITEM_ADD_STATUS', 'toadd');
-Config::set('ITEM_OK_STATUS', 'ok');
-Config::set('ITEM_CHANGE_STATUS', 'change');
-Config::set('ITEM_DELETE_STATUS', 'delete');
-Config::set('ITEM_DISABLED_STATUS', 'disabled');
-Config::set('ITEM_RESTORE_STATUS', 'restore');
-Config::set('ITEM_TOENABLE_STATUS', 'toenable');
-Config::set('ITEM_TODISABLED_STATUS', 'todisable');
-Config::set('ITEM_ORDERED_STATUS', 'ordered');
-Config::set('ITEM_DNSCHANGE_STATUS', 'dnschange');
+Config::getInstance()->set('ITEM_ADD_STATUS', 'toadd');
+Config::getInstance()->set('ITEM_OK_STATUS', 'ok');
+Config::getInstance()->set('ITEM_CHANGE_STATUS', 'change');
+Config::getInstance()->set('ITEM_DELETE_STATUS', 'delete');
+Config::getInstance()->set('ITEM_DISABLED_STATUS', 'disabled');
+Config::getInstance()->set('ITEM_RESTORE_STATUS', 'restore');
+Config::getInstance()->set('ITEM_TOENABLE_STATUS', 'toenable');
+Config::getInstance()->set('ITEM_TODISABLED_STATUS', 'todisable');
+Config::getInstance()->set('ITEM_ORDERED_STATUS', 'ordered');
+Config::getInstance()->set('ITEM_DNSCHANGE_STATUS', 'dnschange');
// SQL variables
-Config::set('MAX_SQL_DATABASE_LENGTH', 64);
-Config::set('MAX_SQL_USER_LENGTH', 16);
-Config::set('MAX_SQL_PASS_LENGTH', 32);
+Config::getInstance()->set('MAX_SQL_DATABASE_LENGTH', 64);
+Config::getInstance()->set('MAX_SQL_USER_LENGTH', 16);
+Config::getInstance()->set('MAX_SQL_PASS_LENGTH', 32);
// the following variables are overwritten via admin cp
-Config::set('DOMAIN_ROWS_PER_PAGE', 10);
+Config::getInstance()->set('DOMAIN_ROWS_PER_PAGE', 10);
// 'admin' => hosting plans are available only in admin level, reseller cannot make custom changes
// 'reseller' => hosting plans are available only in reseller level
-Config::set('HOSTING_PLANS_LEVEL', 'reseller');
+Config::getInstance()->set('HOSTING_PLANS_LEVEL', 'reseller');
/**
* Domain names validation defaults settings - Begin
*/
// TlD strict validation (according Iana database)
-Config::set('TLD_STRICT_VALIDATION', true);
+Config::getInstance()->set('TLD_STRICT_VALIDATION', true);
// SLD strict validation
-Config::set('SLD_STRICT_VALIDATION', true);
+Config::getInstance()->set('SLD_STRICT_VALIDATION', true);
// Maximum number of labels for the domain names
// and subdomains (excluding SLD and TLD)
-Config::set('MAX_DNAMES_LABELS', 1);
+Config::getInstance()->set('MAX_DNAMES_LABELS', 1);
// Maximum number of labels for the subdomain names
-Config::set('MAX_SUBDNAMES_LABELS', 1);
+Config::getInstance()->set('MAX_SUBDNAMES_LABELS', 1);
/**
* Domain names validation default settings - End
*/
// enable or disable supportsystem
// false = disable, true = enable
-Config::set('ISPCP_SUPPORT_SYSTEM', true);
+Config::getInstance()->set('ISPCP_SUPPORT_SYSTEM', true);
// enable or disable lostpassword function
// false = disable, true = enable
-Config::set('LOSTPASSWORD', true);
+Config::getInstance()->set('LOSTPASSWORD', true);
// uniqkeytimeout in minutes
-Config::set('LOSTPASSWORD_TIMEOUT', 30);
+Config::getInstance()->set('LOSTPASSWORD_TIMEOUT', 30);
// captcha imagewidth
-Config::set('LOSTPASSWORD_CAPTCHA_WIDTH', 280);
+Config::getInstance()->set('LOSTPASSWORD_CAPTCHA_WIDTH', 280);
// captcha imagehigh
-Config::set('LOSTPASSWORD_CAPTCHA_HEIGHT', 70);
+Config::getInstance()->set('LOSTPASSWORD_CAPTCHA_HEIGHT', 70);
// captcha background color
-Config::set('LOSTPASSWORD_CAPTCHA_BGCOLOR', array(229,243,252));
+Config::getInstance()->set('LOSTPASSWORD_CAPTCHA_BGCOLOR', array(229,243,252));
// captcha text color
-Config::set('LOSTPASSWORD_CAPTCHA_TEXTCOLOR', array(0,53,92));
+Config::getInstance()->set('LOSTPASSWORD_CAPTCHA_TEXTCOLOR', array(0,53,92));
/**
* captcha ttf fontfiles (have to be under compatible open source license)
@@ -152,74 +152,74 @@
'StayPuft.ttf'
);
// set random catcha font file
-Config::set('LOSTPASSWORD_CAPTCHA_FONT', INCLUDEPATH.'/fonts/' . $fonts[mt_rand(0, count($fonts)-1)]);
+Config::getInstance()->set('LOSTPASSWORD_CAPTCHA_FONT', INCLUDEPATH.'/fonts/' . $fonts[mt_rand(0, count($fonts)-1)]);
// enable or disable bruteforcedetection
// false = disable, true = enable
-Config::set('BRUTEFORCE', true);
+Config::getInstance()->set('BRUTEFORCE', true);
// blocktime in minutes
-Config::set('BRUTEFORCE_BLOCK_TIME', 30);
+Config::getInstance()->set('BRUTEFORCE_BLOCK_TIME', 30);
// max login before block
-Config::set('BRUTEFORCE_MAX_LOGIN', 3);
+Config::getInstance()->set('BRUTEFORCE_MAX_LOGIN', 3);
// max captcha failed attempts before block
-Config::set('BRUTEFORCE_MAX_CAPTCHA', 5);
+Config::getInstance()->set('BRUTEFORCE_MAX_CAPTCHA', 5);
// enable or disable time between logins
// true = disable, false = enable
-Config::set('BRUTEFORCE_BETWEEN', true);
+Config::getInstance()->set('BRUTEFORCE_BETWEEN', true);
// time between logins in seconds
-Config::set('BRUTEFORCE_BETWEEN_TIME', 30);
+Config::getInstance()->set('BRUTEFORCE_BETWEEN_TIME', 30);
// enable or disable maintenance mode
// true = disable, false = enable
-Config::set('MAINTENANCEMODE', false);
+Config::getInstance()->set('MAINTENANCEMODE', false);
// servicemode message
-Config::set('MAINTENANCEMODE_MESSAGE', tr("We are sorry, but the system is currently under maintenance.\nPlease try again later."));
+Config::getInstance()->set('MAINTENANCEMODE_MESSAGE', tr("We are sorry, but the system is currently under maintenance.\nPlease try again later."));
curlang(null, true); // restore language auto detection
// minimum password chars
-Config::set('PASSWD_CHARS', 6);
+Config::getInstance()->set('PASSWD_CHARS', 6);
// enable or disable strong passwords
// false = disable, true = enable
-Config::set('PASSWD_STRONG', true);
+Config::getInstance()->set('PASSWD_STRONG', true);
// The virtual host file from Apache which contains our virtual host entries
-Config::set('SERVER_VHOST_FILE', Config::get('APACHE_SITES_DIR') . '/ispcp.conf');
+Config::getInstance()->set('SERVER_VHOST_FILE', Config::getInstance()->get('APACHE_SITES_DIR') . '/ispcp.conf');
// The minimum level for a message to be sent to DEFAULT_ADMIN_ADDRESS
// PHP's E_USER_* values are used for simplicity:
// E_USER_NOTICE: logins, and all info that isn't very relevant
// E_USER_WARNING: switching to an other account, etc
// E_USER_ERROR: "admin MUST know" messages
-Config::set('LOG_LEVEL', E_USER_NOTICE);
+Config::getInstance()->set('LOG_LEVEL', E_USER_NOTICE);
// Set to false to disable creation of webmaster, postmaster and abuse forwarders when domain/alias/subdomain is created
-Config::set('CREATE_DEFAULT_EMAIL_ADDRESSES', true);
+Config::getInstance()->set('CREATE_DEFAULT_EMAIL_ADDRESSES', true);
//Count default e-mail addresses (abuse,postmaster,webmaster) in user limit
//true: default e-mail are counted
//false: default e-mail are NOT counted
-Config::set('COUNT_DEFAULT_EMAIL_ADDRESSES', false);
+Config::getInstance()->set('COUNT_DEFAULT_EMAIL_ADDRESSES', false);
// Use hard mail suspension when suspending a domain:
// true: email accounts are hard suspended (completely unreachable)
// false: email accounts are soft suspended (passwords are modified so user can't access the accounts)
-Config::set('HARD_MAIL_SUSPENSION', true);
+Config::getInstance()->set('HARD_MAIL_SUSPENSION', true);
// prevent external login (ie. check for valid local referer)
// separated in admin, reseller and client
// true = prevent external login, check for referer, more secure
// false = allow external login, do not check for referere, less security (risky)
-Config::set('PREVENT_EXTERNAL_LOGIN_ADMIN', true);
-Config::set('PREVENT_EXTERNAL_LOGIN_RESELLER', true);
-Config::set('PREVENT_EXTERNAL_LOGIN_CLIENT', true);
+Config::getInstance()->set('PREVENT_EXTERNAL_LOGIN_ADMIN', true);
+Config::getInstance()->set('PREVENT_EXTERNAL_LOGIN_RESELLER', true);
+Config::getInstance()->set('PREVENT_EXTERNAL_LOGIN_CLIENT', true);
// false: disable automatic search for new version
-Config::set('CHECK_FOR_UPDATES', true);
+Config::getInstance()->set('CHECK_FOR_UPDATES', true);
-Config::set('CRITICAL_UPDATE_REVISION', 0);
+Config::getInstance()->set('CRITICAL_UPDATE_REVISION', 0);
-if (!Config::get('ISPCP_SUPPORT_SYSTEM_TARGET')) {
- Config::set('ISPCP_SUPPORT_SYSTEM_TARGET', '_self');
+if (!Config::getInstance()->get('ISPCP_SUPPORT_SYSTEM_TARGET')) {
+ Config::getInstance()->set('ISPCP_SUPPORT_SYSTEM_TARGET', '_self');
}
require_once(INCLUDEPATH . '/date-functions.php');
@@ -242,7 +242,7 @@
// Use HTMLPurifier on every request, if OVERRIDE_PURIFIER is not defined
if ($_REQUEST && !defined('OVERRIDE_PURIFIER')) {
- $config = HTMLPurifier_Config::createDefault();
+ $config = HTMLPurifier_Config::getInstance()->createDefault();
$config->set('HTML.TidyLevel', 'none'); // XSS cleaning
$purifier = new HTMLPurifier($config);
@@ -259,7 +259,7 @@
system_message(tr('Could not get config from database'));
} else {
while ($row = $res->FetchRow()) {
- Config::set($row['name'], $row['value']);
+ Config::getInstance()->set($row['name'], $row['value']);
}
}
Index: gui/include/layout-functions.php
===================================================================
--- gui/include/layout-functions.php (revision 2801)
+++ gui/include/layout-functions.php (working copy)
@@ -54,13 +54,13 @@
if ($rs->RecordCount() == 0
|| (empty($rs->fields['lang']) && empty($rs->fields['layout']))) {
// values for user id, some default stuff
- return array(Config::get('USER_INITIAL_LANG'), Config::get('USER_INITIAL_THEME'));
+ return array(Config::getInstance()->get('USER_INITIAL_LANG'), Config::getInstance()->get('USER_INITIAL_THEME'));
} else if (empty($rs->fields['lang'])) {
- return array(Config::get('USER_INITIAL_LANG'), $rs->fields['layout']);
+ return array(Config::getInstance()->get('USER_INITIAL_LANG'), $rs->fields['layout']);
} else if (empty($rs->fields['layout'])) {
- return array($rs->fields['lang'], Config::get('USER_INITIAL_THEME'));
+ return array($rs->fields['lang'], Config::getInstance()->get('USER_INITIAL_THEME'));
} else {
return array($rs->fields['lang'], $rs->fields['layout']);
@@ -117,7 +117,7 @@
$query = "
SELECT
`customer_id`, `fname`, `lname`, `firm`, `zip`, `city`,"
- . (Config::get('DATABASE_REVISION') >= 11 ? '`state`, ' : '')
+ . (Config::getInstance()->get('DATABASE_REVISION') >= 11 ? '`state`, ' : '')
. "`country`, `email`, `phone`, `fax`, `street1`, `street2`
FROM
`admin`
@@ -145,7 +145,7 @@
$replace[] = $rs->fields['zip'];
$search [] = '{city}';
$replace[] = $rs->fields['city'];
- if (Config::get('DATABASE_REVISION') >= 11) {
+ if (Config::getInstance()->get('DATABASE_REVISION') >= 11) {
$search [] = '{state}';
$replace[] = $rs->fields['state'];
}
Index: gui/include/login-functions.php
===================================================================
--- gui/include/login-functions.php (revision 2801)
+++ gui/include/login-functions.php (working copy)
@@ -117,7 +117,7 @@
$row = $res->FetchRow();
- return ($row['domain_status'] == Config::get('ITEM_OK_STATUS'));
+ return ($row['domain_status'] == Config::getInstance()->get('ITEM_OK_STATUS'));
}
/**
@@ -130,7 +130,7 @@
$sql = Database::getInstance();
if ($timeout === null) {
- $timeout = Config::get('BRUTEFORCE_BLOCK_TIME');
+ $timeout = Config::getInstance()->get('BRUTEFORCE_BLOCK_TIME');
}
$max = 0;
@@ -140,11 +140,11 @@
switch ($type) {
case 'bruteforce':
$query = "UPDATE `login` SET `login_count` = '1' WHERE `login_count` >= ? AND `lastaccess` < ? AND `user_name` is NULL";
- $max = Config::get('BRUTEFORCE_MAX_LOGIN');
+ $max = Config::getInstance()->get('BRUTEFORCE_MAX_LOGIN');
break;
case 'captcha':
$query = "UPDATE `login` SET `captcha_count` = '1' WHERE `captcha_count` >= ? AND `lastaccess` < ? AND `user_name` is NULL";
- $max = Config::get('BRUTEFORCE_MAX_CAPTCHA');
+ $max = Config::getInstance()->get('BRUTEFORCE_MAX_CAPTCHA');
break;
default:
write_log(sprintf('FIXME: %s:%d' . "\n" . 'Unknown unblock reason %s',__FILE__, __LINE__, $type));
@@ -175,11 +175,11 @@
switch ($type) {
case 'bruteforce':
$query = "SELECT * FROM `login` WHERE `ipaddr` = ? AND `login_count` = ?";
- $max = Config::get('BRUTEFORCE_MAX_LOGIN');
+ $max = Config::getInstance()->get('BRUTEFORCE_MAX_LOGIN');
break;
case 'captcha':
$query = "SELECT * FROM `login` WHERE `ipaddr` = ? AND `captcha_count` = ?";
- $max = Config::get('BRUTEFORCE_MAX_CAPTCHA');
+ $max = Config::getInstance()->get('BRUTEFORCE_MAX_CAPTCHA');
break;
default:
write_log(sprintf('FIXME: %s:%d' . "\n" . 'Unknown block reason %s',__FILE__, __LINE__, $type));
@@ -207,7 +207,7 @@
function shall_user_wait($ipaddr = null, $displayMessage = true) {
$sql = Database::getInstance();
- if (!Config::get('BRUTEFORCE')) {
+ if (!Config::getInstance()->get('BRUTEFORCE')) {
return false;
}
if ($ipaddr === null) {
@@ -225,15 +225,15 @@
$lastaccess = $data['lastaccess'];
- if (Config::get('BRUTEFORCE_BETWEEN')) {
- $btime = $lastaccess + Config::get('BRUTEFORCE_BETWEEN_TIME');
+ if (Config::getInstance()->get('BRUTEFORCE_BETWEEN')) {
+ $btime = $lastaccess + Config::getInstance()->get('BRUTEFORCE_BETWEEN_TIME');
} else {
return false;
}
if ($btime > time()) {
if ($displayMessage) {
- $backButtonDestination = Config::get('BASE_SERVER_VHOST_PREFIX') . Config::get('BASE_SERVER_VHOST');
+ $backButtonDestination = Config::getInstance()->get('BASE_SERVER_VHOST_PREFIX') . Config::getInstance()->get('BASE_SERVER_VHOST');
system_message(tr('You have to wait %d seconds.', $btime - time()), $backButtonDestination);
}
return true;
@@ -272,18 +272,18 @@
$logincount = $data['login_count'];
$captchacount = $data['captcha_count'];
- if ($type == 'bruteforce' && Config::get('BRUTEFORCE')
- && $logincount > Config::get('BRUTEFORCE_MAX_LOGIN')) {
+ if ($type == 'bruteforce' && Config::getInstance()->get('BRUTEFORCE')
+ && $logincount > Config::getInstance()->get('BRUTEFORCE_MAX_LOGIN')) {
block_ipaddr($ipaddr, 'Login');
}
- if ($type == 'captcha' && Config::get('BRUTEFORCE')
- && $captchacount > Config::get('BRUTEFORCE_MAX_CAPTCHA') && Config::get('BRUTEFORCE')) {
+ if ($type == 'captcha' && Config::getInstance()->get('BRUTEFORCE')
+ && $captchacount > Config::getInstance()->get('BRUTEFORCE_MAX_CAPTCHA') && Config::getInstance()->get('BRUTEFORCE')) {
block_ipaddr($ipaddr, 'CAPTCHA');
}
- if (Config::get('BRUTEFORCE_BETWEEN')) {
- $btime = $lastaccess + Config::get('BRUTEFORCE_BETWEEN_TIME');
+ if (Config::getInstance()->get('BRUTEFORCE_BETWEEN')) {
+ $btime = $lastaccess + Config::getInstance()->get('BRUTEFORCE_BETWEEN_TIME');
} else {
$btime = 0;
}
@@ -298,7 +298,7 @@
exec_query($sql, $query, $ipaddr);
return false;
} else {
- $backButtonDestination = Config::get('BASE_SERVER_VHOST_PREFIX') . Config::get('BASE_SERVER_VHOST');
+ $backButtonDestination = Config::getInstance()->get('BASE_SERVER_VHOST_PREFIX') . Config::getInstance()->get('BASE_SERVER_VHOST');
write_log("Login error, $ipaddr wait " . ($btime - time()) . " seconds", E_USER_NOTICE);
system_message(tr('You have to wait %d seconds.', $btime - time()), $backButtonDestination);
@@ -316,7 +316,7 @@
* @param String $type
*/
function block_ipaddr($ipaddr, $type = 'General') {
- write_log("$type protection, " . htmlspecialchars($ipaddr, ENT_QUOTES, "UTF-8") . " blocked for " . Config::get('BRUTEFORCE_BLOCK_TIME') . " minutes.");
+ write_log("$type protection, " . htmlspecialchars($ipaddr, ENT_QUOTES, "UTF-8") . " blocked for " . Config::getInstance()->get('BRUTEFORCE_BLOCK_TIME') . " minutes.");
deny_access();
}
@@ -324,8 +324,8 @@
* @todo describe function
*/
function deny_access() {
- $backButtonDestination =Config::get('BASE_SERVER_VHOST_PREFIX') . Config::get('BASE_SERVER_VHOST');
- system_message(tr('You have been blocked for %d minutes.', Config::get('BRUTEFORCE_BLOCK_TIME')), $backButtonDestination);
+ $backButtonDestination =Config::getInstance()->get('BASE_SERVER_VHOST_PREFIX') . Config::getInstance()->get('BASE_SERVER_VHOST');
+ system_message(tr('You have been blocked for %d minutes.', Config::getInstance()->get('BRUTEFORCE_BLOCK_TIME')), $backButtonDestination);
}
/**
@@ -343,7 +343,7 @@
function do_session_timeout() {
$sql = Database::getInstance();
- $ttl = time() - Config::get('SESSION_TIMEOUT') * 60;
+ $ttl = time() - Config::getInstance()->get('SESSION_TIMEOUT') * 60;
$query = "DELETE FROM `login` WHERE `lastaccess` < ?";
exec_query($sql, $query, array($ttl));
Index: gui/include/login.php
===================================================================
--- gui/include/login.php (revision 2801)
+++ gui/include/login.php (working copy)
@@ -30,9 +30,9 @@
function init_login() {
// just make sure to expire counters in case BRUTEFORCE is turned off
- unblock(Config::get('BRUTEFORCE_BLOCK_TIME'));
+ unblock(Config::getInstance()->get('BRUTEFORCE_BLOCK_TIME'));
- if (Config::get('BRUTEFORCE')) {
+ if (Config::getInstance()->get('BRUTEFORCE')) {
is_ipaddr_blocked(null, 'bruteforce', true);
}
}
@@ -42,7 +42,7 @@
*/
function register_user($uname, $upass) {
$sql = Database::getInstance();
- $backButtonDestination = Config::get('BASE_SERVER_VHOST_PREFIX') . Config::get('BASE_SERVER_VHOST');
+ $backButtonDestination = Config::getInstance()->get('BASE_SERVER_VHOST_PREFIX') . Config::getInstance()->get('BASE_SERVER_VHOST');
check_ipaddr();
@@ -58,7 +58,7 @@
if ((
criticalUpdate::getInstance()->checkUpdateExists()
|| databaseUpdate::getInstance()->checkUpdateExists()
- || (Config::get('MAINTENANCEMODE'))
+ || (Config::getInstance()->get('MAINTENANCEMODE'))
) && $udata['admin_type'] != 'admin') {
write_log("Login error, ".$uname." system currently in maintenance mode");
system_message(tr('System is currently under maintenance! Only administrators can login.'));
@@ -161,7 +161,7 @@
return false;
}
- if (( criticalUpdate::getInstance()->checkUpdateExists() || databaseUpdate::getInstance()->checkUpdateExists() || (Config::get('MAINTENANCEMODE')) ) && $user_type != 'admin') {
+ if (( criticalUpdate::getInstance()->checkUpdateExists() || databaseUpdate::getInstance()->checkUpdateExists() || (Config::getInstance()->get('MAINTENANCEMODE')) ) && $user_type != 'admin') {
unset_user_login_data(true);
write_log("System is currently in maintenance mode. Logging out ".$user_logged."");
user_goto('/index.php');
Index: gui/include/lostpassword-functions.php
===================================================================
--- gui/include/lostpassword-functions.php (revision 2801)
+++ gui/include/lostpassword-functions.php (working copy)
@@ -36,17 +36,17 @@
* @todo use file_exists in try-catch block
*/
function captcha_fontfile_exists() {
- return file_exists(Config::get('LOSTPASSWORD_CAPTCHA_FONT'));
+ return file_exists(Config::getInstance()->get('LOSTPASSWORD_CAPTCHA_FONT'));
}
function createImage($strSessionVar) {
- $rgBgColor = Config::get('LOSTPASSWORD_CAPTCHA_BGCOLOR');
- $rgTextColor = Config::get('LOSTPASSWORD_CAPTCHA_TEXTCOLOR');
+ $rgBgColor = Config::getInstance()->get('LOSTPASSWORD_CAPTCHA_BGCOLOR');
+ $rgTextColor = Config::getInstance()->get('LOSTPASSWORD_CAPTCHA_TEXTCOLOR');
- $x = Config::get('LOSTPASSWORD_CAPTCHA_WIDTH');
- $y = Config::get('LOSTPASSWORD_CAPTCHA_HEIGHT');
+ $x = Config::getInstance()->get('LOSTPASSWORD_CAPTCHA_WIDTH');
+ $y = Config::getInstance()->get('LOSTPASSWORD_CAPTCHA_HEIGHT');
- $font = Config::get('LOSTPASSWORD_CAPTCHA_FONT');
+ $font = Config::getInstance()->get('LOSTPASSWORD_CAPTCHA_FONT');
$iRandVal = strrand(8, $strSessionVar);
@@ -252,9 +252,9 @@
$message = $data['message'];
- $base_vhost = Config::get('BASE_SERVER_VHOST');
+ $base_vhost = Config::getInstance()->get('BASE_SERVER_VHOST');
- $base_vhost_prefix = Config::get('BASE_SERVER_VHOST_PREFIX');
+ $base_vhost_prefix = Config::getInstance()->get('BASE_SERVER_VHOST_PREFIX');
if ($from_name) {
$from = '"' . $from_name . '" <' . $from_email . '>';
@@ -337,8 +337,8 @@
$subject = $data['subject'];
$message = $data['message'];
- $base_vhost = Config::get('BASE_SERVER_VHOST');
- $base_vhost_prefix = Config::get('BASE_SERVER_VHOST_PREFIX');
+ $base_vhost = Config::getInstance()->get('BASE_SERVER_VHOST');
+ $base_vhost_prefix = Config::getInstance()->get('BASE_SERVER_VHOST_PREFIX');
if ($from_name) {
$from = '"' . $from_name . "\" <" . $from_email . ">";
Index: gui/include/reseller-functions.php
===================================================================
--- gui/include/reseller-functions.php (revision 2801)
+++ gui/include/reseller-functions.php (working copy)
@@ -70,8 +70,8 @@
'TR_MENU_LOGOUT' => tr('Logout'),
'TR_MENU_OVERVIEW' => tr('Overview'),
'TR_MENU_LANGUAGE' => tr('Language'),
- 'SUPPORT_SYSTEM_PATH' => Config::get('ISPCP_SUPPORT_SYSTEM_PATH'),
- 'SUPPORT_SYSTEM_TARGET' => Config::get('ISPCP_SUPPORT_SYSTEM_TARGET'),
+ 'SUPPORT_SYSTEM_PATH' => Config::getInstance()->get('ISPCP_SUPPORT_SYSTEM_PATH'),
+ 'SUPPORT_SYSTEM_TARGET' => Config::getInstance()->get('ISPCP_SUPPORT_SYSTEM_TARGET'),
'TR_MENU_ORDERS' => tr('Manage Orders'),
'TR_MENU_ORDER_SETTINGS' => tr('Order settings'),
'TR_MENU_ORDER_EMAIL' => tr('Order email setup'),
@@ -131,7 +131,7 @@
$rs = exec_query($sql, $query, array($_SESSION['user_id']));
- if (!Config::get('ISPCP_SUPPORT_SYSTEM') || $rs->fields['support_system'] == 'no') {
+ if (!Config::getInstance()->get('ISPCP_SUPPORT_SYSTEM') || $rs->fields['support_system'] == 'no') {
$tpl->assign('ISACTIVE_SUPPORT', '');
}
@@ -169,15 +169,15 @@
'TR_MENU_LOGOUT' => tr('Logout'),
'TR_MENU_OVERVIEW' => tr('Overview'),
'TR_MENU_LANGUAGE' => tr('Language'),
- 'SUPPORT_SYSTEM_PATH' => Config::get('ISPCP_SUPPORT_SYSTEM_PATH'),
- 'SUPPORT_SYSTEM_TARGET' => Config::get('ISPCP_SUPPORT_SYSTEM_TARGET'),
+ 'SUPPORT_SYSTEM_PATH' => Config::getInstance()->get('ISPCP_SUPPORT_SYSTEM_PATH'),
+ 'SUPPORT_SYSTEM_TARGET' => Config::getInstance()->get('ISPCP_SUPPORT_SYSTEM_TARGET'),
'TR_MENU_ORDERS' => tr('Manage Orders'),
'TR_MENU_ORDER_SETTINGS' => tr('Order settings'),
'TR_MENU_ORDER_EMAIL' => tr('Order email setup'),
'TR_MENU_LOSTPW_EMAIL' => tr('Lostpw email setup'),
- 'VERSION' => Config::get('Version'),
- 'BUILDDATE' => Config::get('BuildDate'),
- 'CODENAME' => Config::get('CodeName')
+ 'VERSION' => Config::getInstance()->get('Version'),
+ 'BUILDDATE' => Config::getInstance()->get('BuildDate'),
+ 'CODENAME' => Config::getInstance()->get('CodeName')
)
);
@@ -233,10 +233,10 @@
$rs = exec_query($sql, $query, array($_SESSION['user_id']));
- if (!Config::get('ISPCP_SUPPORT_SYSTEM') || $rs->fields['support_system'] == 'no') {
+ if (!Config::getInstance()->get('ISPCP_SUPPORT_SYSTEM') || $rs->fields['support_system'] == 'no') {
$tpl->assign('ISACTIVE_SUPPORT', '');
}
- if (Config::exists('HOSTING_PLANS_LEVEL') && strtolower(Config::get('HOSTING_PLANS_LEVEL')) === 'admin') {
+ if (Config::getInstance()->exists('HOSTING_PLANS_LEVEL') && strtolower(Config::getInstance()->get('HOSTING_PLANS_LEVEL')) === 'admin') {
$tpl->assign('HP_MENU_ADD', '');
}
@@ -560,7 +560,7 @@
$als_current = records_count('domain_aliasses', 'domain_id', $user_id);
$als_max = $data['domain_alias_limit'];
- if (Config::get('COUNT_DEFAULT_EMAIL_ADDRESSES')) {
+ if (Config::getInstance()->get('COUNT_DEFAULT_EMAIL_ADDRESSES')) {
// Catch all is not a mailbox and haven't to be count - TheCry
$mail_current = records_count('mail_users', 'mail_type NOT RLIKE \'_catchall\' AND domain_id', $user_id);
} else {
@@ -770,10 +770,10 @@
} else if ($inpass_re !== $inpass) {
$user_add_error = tr("Passwords don't match!");
} else if (!chk_password($inpass)) {
- if (Config::get('PASSWD_STRONG')) {
- $user_add_error = sprintf(tr('The password must be at least %s long and contain letters and numbers to be valid.'), Config::get('PASSWD_CHARS'));
+ if (Config::getInstance()->get('PASSWD_STRONG')) {
+ $user_add_error = sprintf(tr('The password must be at least %s long and contain letters and numbers to be valid.'), Config::getInstance()->get('PASSWD_CHARS'));
} else {
- $user_add_error = sprintf(tr('Password data is shorter than %s signs or includes not permitted signs!'), Config::get('PASSWD_CHARS'));
+ $user_add_error = sprintf(tr('Password data is shorter than %s signs or includes not permitted signs!'), Config::getInstance()->get('PASSWD_CHARS'));
}
}
}
@@ -813,14 +813,14 @@
*/
function translate_dmn_status($status) {
switch ($status) {
- case Config::get('ITEM_OK_STATUS'): return tr('OK');
- case Config::get('ITEM_ADD_STATUS'): return tr('Addition in progress');
- case Config::get('ITEM_CHANGE_STATUS'): return tr('Modification in progress');
- case Config::get('ITEM_DELETE_STATUS'): return tr('Deletion in progress');
- case Config::get('ITEM_DISABLED_STATUS'): return tr('Suspended');
- case Config::get('ITEM_TOENABLE_STATUS'): return tr('Being enabled');
- case Config::get('ITEM_TODISABLED_STATUS'): return tr('Being suspended');
- case Config::get('ITEM_ORDERED_STATUS'): return tr('Awaiting for approval');
+ case Config::getInstance()->get('ITEM_OK_STATUS'): return tr('OK');
+ case Config::getInstance()->get('ITEM_ADD_STATUS'): return tr('Addition in progress');
+ case Config::getInstance()->get('ITEM_CHANGE_STATUS'): return tr('Modification in progress');
+ case Config::getInstance()->get('ITEM_DELETE_STATUS'): return tr('Deletion in progress');
+ case Config::getInstance()->get('ITEM_DISABLED_STATUS'): return tr('Suspended');
+ case Config::getInstance()->get('ITEM_TOENABLE_STATUS'): return tr('Being enabled');
+ case Config::getInstance()->get('ITEM_TODISABLED_STATUS'): return tr('Being suspended');
+ case Config::getInstance()->get('ITEM_ORDERED_STATUS'): return tr('Awaiting for approval');
default: return tr('Unknown error');
}
} // end of translate_dmn_status()
@@ -1555,8 +1555,8 @@
$to = $uemail;
}
- $activate_link = Config::get('BASE_SERVER_VHOST_PREFIX').Config::get('BASE_SERVER_VHOST');
- $coid = Config::exists('CUSTOM_ORDERPANEL_ID') ? Config::get('CUSTOM_ORDERPANEL_ID'): '';
+ $activate_link = Config::getInstance()->get('BASE_SERVER_VHOST_PREFIX').Config::getInstance()->get('BASE_SERVER_VHOST');
+ $coid = Config::getInstance()->exists('CUSTOM_ORDERPANEL_ID') ? Config::getInstance()->get('CUSTOM_ORDERPANEL_ID'): '';
$key = sha1($order_id.'-'.$domain_name.'-'.$admin_id.'-'.$coid);
$activate_link .= '/orderpanel/activate.php?id='.$order_id.'&k='.$key;
@@ -1578,7 +1578,7 @@
$subject = encode($subject);
$headers = "From: ". $from . "\n";
- $headers .= "MIME-Version: 1.0\n" . "Content-Type: text/plain; charset=utf-8\n" . "Content-Transfer-Encoding: 8bit\n" . "X-Mailer: ispCP " . Config::get('Version') . " Service Mailer";
+ $headers .= "MIME-Version: 1.0\n" . "Content-Type: text/plain; charset=utf-8\n" . "Content-Transfer-Encoding: 8bit\n" . "X-Mailer: ispCP " . Config::getInstance()->get('Version') . " Service Mailer";
mail($to, $subject, $message, $headers);
}
@@ -1629,9 +1629,9 @@
$search [] = '{ALIAS}';
$replace[] = $alias_name;
$search [] = '{BASE_SERVER_VHOST}';
- $replace[] = Config::get('BASE_SERVER_VHOST');
+ $replace[] = Config::getInstance()->get('BASE_SERVER_VHOST');
$search [] = '{BASE_SERVER_VHOST_PREFIX}';
- $replace[] = Config::get('BASE_SERVER_VHOST_PREFIX');
+ $replace[] = Config::getInstance()->get('BASE_SERVER_VHOST_PREFIX');
$subject = str_replace($search, $replace, $subject);
$message = str_replace($search, $replace, $message);
@@ -1639,7 +1639,7 @@
$subject = encode($subject);
$headers = "From: ". $from ."\n";
- $headers .= "MIME-Version: 1.0\n" . "Content-Type: text/plain; charset=utf-8\n" . "Content-Transfer-Encoding: 8bit\n" . "X-Mailer: ispCP " . Config::get('Version') . " Service Mailer";
+ $headers .= "MIME-Version: 1.0\n" . "Content-Type: text/plain; charset=utf-8\n" . "Content-Transfer-Encoding: 8bit\n" . "X-Mailer: ispCP " . Config::getInstance()->get('Version') . " Service Mailer";
$mail_result = mail($to, $subject, $message, $headers);
@@ -1654,7 +1654,7 @@
$sql = Database::getInstance();
- if (Config::get('CREATE_DEFAULT_EMAIL_ADDRESSES')) {
+ if (Config::getInstance()->get('CREATE_DEFAULT_EMAIL_ADDRESSES')) {
$forward_type = ($dmn_type == 'alias') ? 'alias_forward' : 'normal_forward';
@@ -1683,7 +1683,7 @@
$dmn_id,
$forward_type,
$sub_id,
- Config::get('ITEM_ADD_STATUS'),
+ Config::getInstance()->get('ITEM_ADD_STATUS'),
'_no_',
10485760,
'webmaster@'.$dmn_part
@@ -1698,7 +1698,7 @@
$dmn_id,
$forward_type,
$sub_id,
- Config::get('ITEM_ADD_STATUS'),
+ Config::getInstance()->get('ITEM_ADD_STATUS'),
'_no_',
10485760,
'postmaster@'.$dmn_part
@@ -1713,7 +1713,7 @@
$dmn_id,
$forward_type,
$sub_id,
- Config::get('ITEM_ADD_STATUS'),
+ Config::getInstance()->get('ITEM_ADD_STATUS'),
'_no_',
10485760,
'abuse@'.$dmn_part
@@ -1734,7 +1734,7 @@
function get_reseller_detail_count($tablename, $ua) {
global $sql;
- $delstatus = Config::get('ITEM_DELETE_STATUS');
+ $delstatus = Config::getInstance()->get('ITEM_DELETE_STATUS');
$query = "SELECT COUNT(*) AS cnt FROM `".$tablename;
if ($tablename == 'ftp_users') {
@@ -1779,7 +1779,7 @@
// current_disk_amnt = disk_space
// current_traff_amnt = traffic
- $delstatus = Config::get('ITEM_DELETE_STATUS');
+ $delstatus = Config::getInstance()->get('ITEM_DELETE_STATUS');
// Get all users of reseller:
$query = "
Index: gui/include/spGzip.php
===================================================================
--- gui/include/spGzip.php (revision 2801)
+++ gui/include/spGzip.php (working copy)
@@ -241,7 +241,7 @@
// look in config if enable/disable extra (server load) informations
-if (Config::get('SHOW_SERVERLOAD')) {
+if (Config::getInstance()->get('SHOW_SERVERLOAD')) {
$GLOBALS['class']['output']->showSize = true;
} else {
$GLOBALS['class']['output']->showSize = false;
Index: gui/include/sql.php
===================================================================
--- gui/include/sql.php (revision 2801)
+++ gui/include/sql.php (working copy)
@@ -28,24 +28,24 @@
* isp Control Panel. All Rights Reserved.
*/
-Config::set('DB_TYPE', Config::get('DATABASE_TYPE'));
-Config::set('DB_HOST', Config::get('DATABASE_HOST'));
-Config::set('DB_USER', Config::get('DATABASE_USER'));
-Config::set('DB_PASS', decrypt_db_password(Config::get('DATABASE_PASSWORD')));
-Config::set('DB_NAME', Config::get('DATABASE_NAME'));
+Config::getInstance()->set('DB_TYPE', Config::getInstance()->get('DATABASE_TYPE'));
+Config::getInstance()->set('DB_HOST', Config::getInstance()->get('DATABASE_HOST'));
+Config::getInstance()->set('DB_USER', Config::getInstance()->get('DATABASE_USER'));
+Config::getInstance()->set('DB_PASS', decrypt_db_password(Config::getInstance()->get('DATABASE_PASSWORD')));
+Config::getInstance()->set('DB_NAME', Config::getInstance()->get('DATABASE_NAME'));
// Get an Database instance
-@$sql = Database::connect(Config::get('DB_USER'), Config::get('DB_PASS'), Config::get('DB_TYPE'), Config::get('DB_HOST'), Config::get('DB_NAME'))
+@$sql = Database::connect(Config::getInstance()->get('DB_USER'), Config::getInstance()->get('DB_PASS'), Config::getInstance()->get('DB_TYPE'), Config::getInstance()->get('DB_HOST'), Config::getInstance()->get('DB_NAME'))
or system_message('ERROR: Unable to connect to SQL server !
SQL returned: ' . $sql->ErrorMsg());
// switch optionally to utf8 based communication with the database
-if (Config::exists('DATABASE_UTF8') && Config::get('DATABASE_UTF8') == 'yes') {
+if (Config::getInstance()->exists('DATABASE_UTF8') && Config::getInstance()->get('DATABASE_UTF8') == 'yes') {
@$sql->Execute("SET NAMES 'utf8'");
}
// No longer needed - unset for safety
-Config::set('DB_USER', null);
-Config::set('DB_PASS', null);
+Config::getInstance()->set('DB_USER', null);
+Config::getInstance()->set('DB_PASS', null);
/**
* @todo Please describe this function!
@@ -79,12 +79,12 @@
}
// Send error output via email to admin
- $admin_email = Config::get('DEFAULT_ADMIN_ADDRESS');
+ $admin_email = Config::getInstance()->get('DEFAULT_ADMIN_ADDRESS');
if (!empty($admin_email)) {
- $default_hostname = Config::get('SERVER_HOSTNAME');
- $default_base_server_ip = Config::get('BASE_SERVER_IP');
- $Version = Config::get('Version');
+ $default_hostname = Config::getInstance()->get('SERVER_HOSTNAME');
+ $default_base_server_ip = Config::getInstance()->get('BASE_SERVER_IP');
+ $Version = Config::getInstance()->get('Version');
$headers = "From: \"ispCP Logging Daemon\" <" . $admin_email . ">\n";
$headers .= "MIME-Version: 1.0\nContent-Type: text/plain; charset=utf-8\nContent-Transfer-Encoding: 7bit\n";
$headers .= "X-Mailer: ispCP $Version Logging Mailer";
Index: gui/include/system-message.php
===================================================================
--- gui/include/system-message.php (revision 2801)
+++ gui/include/system-message.php (working copy)
@@ -34,7 +34,7 @@
function system_message($msg, $backButtonDestination = "") {
$theme_color = (isset($_SESSION['user_theme']))
? $_SESSION['user_theme']
- : Config::get('USER_INITIAL_THEME');
+ : Config::getInstance()->get('USER_INITIAL_THEME');
if (empty($backButtonDestination)) {
$backButtonDestination = "javascript:history.go(-1)";
@@ -43,11 +43,11 @@
$tpl = new pTemplate();
// If we are on the login page, path will be like this
- $template = Config::get('LOGIN_TEMPLATE_PATH') . '/system-message.tpl';
+ $template = Config::getInstance()->get('LOGIN_TEMPLATE_PATH') . '/system-message.tpl';
if (!is_file($template)) {
// But if we're inside the panel it will be like this
- $template = '../' . Config::get('LOGIN_TEMPLATE_PATH') . '/system-message.tpl';
+ $template = '../' . Config::getInstance()->get('LOGIN_TEMPLATE_PATH') . '/system-message.tpl';
}
if (!is_file($template)) {
Index: gui/index.php
===================================================================
--- gui/index.php (revision 2801)
+++ gui/index.php (working copy)
@@ -63,34 +63,34 @@
$theme_color = isset($_SESSION['user_theme'])
? $_SESSION['user_theme']
- : Config::get('USER_INITIAL_THEME');
+ : Config::getInstance()->get('USER_INITIAL_THEME');
$tpl = new pTemplate();
-if ((Config::get('MAINTENANCEMODE')
+if ((Config::getInstance()->get('MAINTENANCEMODE')
|| databaseUpdate::getInstance()->checkUpdateExists()
|| criticalUpdate::getInstance()->checkUpdateExists())
&& !isset($_GET['admin'])) {
- $tpl->define_dynamic('page', Config::get('LOGIN_TEMPLATE_PATH') . '/maintenancemode.tpl');
+ $tpl->define_dynamic('page', Config::getInstance()->get('LOGIN_TEMPLATE_PATH') . '/maintenancemode.tpl');
$tpl->assign(
array(
'TR_PAGE_TITLE' => tr('ispCP Omega a Virtual Hosting Control System'),
- 'THEME_COLOR_PATH' => Config::get('LOGIN_TEMPLATE_PATH'),
+ 'THEME_COLOR_PATH' => Config::getInstance()->get('LOGIN_TEMPLATE_PATH'),
'THEME_CHARSET' => tr('encoding'),
- 'TR_MESSAGE' => nl2br(Config::get('MAINTENANCEMODE_MESSAGE')),
+ 'TR_MESSAGE' => nl2br(Config::getInstance()->get('MAINTENANCEMODE_MESSAGE')),
'TR_ADMINLOGIN' => tr('Administrator login')
)
);
} else {
- $tpl->define_dynamic('page', Config::get('LOGIN_TEMPLATE_PATH') . '/index.tpl');
+ $tpl->define_dynamic('page', Config::getInstance()->get('LOGIN_TEMPLATE_PATH') . '/index.tpl');
$tpl->assign(
array(
'TR_MAIN_INDEX_PAGE_TITLE' => tr('ispCP Omega a Virtual Hosting Control System'),
- 'THEME_COLOR_PATH' => Config::get('LOGIN_TEMPLATE_PATH'),
+ 'THEME_COLOR_PATH' => Config::getInstance()->get('LOGIN_TEMPLATE_PATH'),
'THEME_CHARSET' => tr('encoding'),
'TR_LOGIN' => tr('Login'),
'TR_USERNAME' => tr('Username'),
@@ -108,7 +108,7 @@
}
-if (Config::get('LOSTPASSWORD')) {
+if (Config::getInstance()->get('LOSTPASSWORD')) {
$tpl->assign('TR_LOSTPW', tr('Lost password'));
} else {
$tpl->assign('TR_LOSTPW', '');
@@ -120,6 +120,6 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
Index: gui/lostpassword.php
===================================================================
--- gui/lostpassword.php (revision 2801)
+++ gui/lostpassword.php (working copy)
@@ -30,7 +30,7 @@
require 'include/ispcp-lib.php';
-if (!Config::get('LOSTPASSWORD')) {
+if (!Config::getInstance()->get('LOSTPASSWORD')) {
system_message(tr('Retrieving lost passwords is currently not possible'));
die();
}
@@ -45,12 +45,12 @@
}
// remove old uniqkeys
-removeOldKeys(Config::get('LOSTPASSWORD_TIMEOUT'));
+removeOldKeys(Config::getInstance()->get('LOSTPASSWORD_TIMEOUT'));
if (isset($_SESSION['user_theme'])) {
$theme_color = $_SESSION['user_theme'];
} else {
- $theme_color = Config::get('USER_INITIAL_THEME');
+ $theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
}
if (isset($_GET['key'])) {
@@ -58,7 +58,7 @@
check_input($_GET['key']);
$tpl = new pTemplate();
- $tpl->define('page', Config::get('LOGIN_TEMPLATE_PATH') . '/lostpassword_message.tpl');
+ $tpl->define('page', Config::getInstance()->get('LOGIN_TEMPLATE_PATH') . '/lostpassword_message.tpl');
$tpl->assign(
array(
'TR_MAIN_INDEX_PAGE_TITLE' => tr('ispCP - Virtual Hosting Control System'),
@@ -86,7 +86,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
- if (Config::get('DUMP_GUI_DEBUG')) {
+ if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
die();
@@ -101,7 +101,7 @@
check_input($_POST['capcode']);
$tpl = new pTemplate();
- $tpl->define('page', Config::get('LOGIN_TEMPLATE_PATH') . '/lostpassword_message.tpl');
+ $tpl->define('page', Config::getInstance()->get('LOGIN_TEMPLATE_PATH') . '/lostpassword_message.tpl');
$tpl->assign(
array(
'TR_MAIN_INDEX_PAGE_TITLE' => tr('ispCP - Virtual Hosting Control System'),
@@ -113,7 +113,7 @@
if ($_SESSION['image'] == $_POST['capcode'] && requestpassword($_POST['uname'])) {
$tpl->assign(
array(
- 'TR_MESSAGE' => tr('Your password request has been initiated. You will receive an email with instructions to complete the process. This reset request will expire in %s minutes.', Config::get('LOSTPASSWORD_TIMEOUT')),
+ 'TR_MESSAGE' => tr('Your password request has been initiated. You will receive an email with instructions to complete the process. This reset request will expire in %s minutes.', Config::getInstance()->get('LOSTPASSWORD_TIMEOUT')),
'TR_LINK' => '' . tr('Back') . ''
)
);
@@ -129,26 +129,26 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
- if (Config::get('DUMP_GUI_DEBUG')) {
+ if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
die();
}
}
-unblock(Config::get('BRUTEFORCE_BLOCK_TIME'), 'captcha');
+unblock(Config::getInstance()->get('BRUTEFORCE_BLOCK_TIME'), 'captcha');
is_ipaddr_blocked(null, 'captcha', true);
$tpl = new pTemplate();
-$tpl->define('page', Config::get('LOGIN_TEMPLATE_PATH') . '/lostpassword.tpl');
+$tpl->define('page', Config::getInstance()->get('LOGIN_TEMPLATE_PATH') . '/lostpassword.tpl');
$tpl->assign(
array(
'TR_MAIN_INDEX_PAGE_TITLE' => tr('ispCP - Virtual Hosting Control System'),
- 'THEME_COLOR_PATH' => Config::get('LOGIN_TEMPLATE_PATH'),
+ 'THEME_COLOR_PATH' => Config::getInstance()->get('LOGIN_TEMPLATE_PATH'),
'THEME_CHARSET' => tr('encoding'),
'TR_CAPCODE' => tr('Security code'),
'TR_IMGCAPCODE_DESCRIPTION' => tr('(To avoid abuse, we ask you to write the combination of letters on the above picture into the field "Security code")'),
- 'TR_IMGCAPCODE' => '
',
+ 'TR_IMGCAPCODE' => '',
'TR_USERNAME' => tr('Username'),
'TR_SEND' => tr('Request password'),
'TR_BACK' => tr('Back')
@@ -158,6 +158,6 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
Index: gui/orderpanel/activate.php
===================================================================
--- gui/orderpanel/activate.php (revision 2801)
+++ gui/orderpanel/activate.php (working copy)
@@ -53,7 +53,7 @@
if ($rs->RecordCount() == 1) {
$domain_name = $rs->fields['domain_name'];
$admin_id = $rs->fields['user_id'];
- $coid = Config::exists('CUSTOM_ORDERPANEL_ID') ? Config::get('CUSTOM_ORDERPANEL_ID'): '';
+ $coid = Config::getInstance()->exists('CUSTOM_ORDERPANEL_ID') ? Config::getInstance()->get('CUSTOM_ORDERPANEL_ID'): '';
$ckey = sha1($order_id.'-'.$domain_name.'-'.$admin_id.'-'.$coid);
if ($ckey == $key)
$result = true;
@@ -128,7 +128,7 @@
$message = html_entity_decode($message, ENT_QUOTES, 'UTF-8');
$headers = "From: ". $from . "\n";
- $headers .= "MIME-Version: 1.0\n" . "Content-Type: text/plain; charset=utf-8\n" . "Content-Transfer-Encoding: 8bit\n" . "X-Mailer: ispCP " . Config::get('Version') . " Service Mailer";
+ $headers .= "MIME-Version: 1.0\n" . "Content-Type: text/plain; charset=utf-8\n" . "Content-Transfer-Encoding: 8bit\n" . "X-Mailer: ispCP " . Config::getInstance()->get('Version') . " Service Mailer";
mail($from, $subject, $message, $headers);
}
@@ -140,12 +140,12 @@
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('PURCHASE_TEMPLATE_PATH') . '/activate.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('PURCHASE_TEMPLATE_PATH') . '/activate.tpl');
$tpl->define_dynamic('page_message', 'page');
$theme_color = isset($_SESSION['user_theme'])
? $_SESSION['user_theme']
- : Config::get('USER_INITIAL_THEME');
+ : Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -168,6 +168,6 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
Index: gui/orderpanel/addon.php
===================================================================
--- gui/orderpanel/addon.php (revision 2801)
+++ gui/orderpanel/addon.php (working copy)
@@ -31,7 +31,7 @@
require '../include/ispcp-lib.php';
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('PURCHASE_TEMPLATE_PATH') . '/addon.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('PURCHASE_TEMPLATE_PATH') . '/addon.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('purchase_header', 'page');
$tpl->define_dynamic('purchase_footer', 'page');
@@ -61,8 +61,8 @@
}
function is_plan_available(&$sql, $plan_id, $user_id) {
- if (Config::exists('HOSTING_PLANS_LEVEL') &&
- Config::get('HOSTING_PLANS_LEVEL') === 'admin') {
+ if (Config::getInstance()->exists('HOSTING_PLANS_LEVEL') &&
+ Config::getInstance()->get('HOSTING_PLANS_LEVEL') === 'admin') {
$query = "
SELECT
*
@@ -141,7 +141,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
Index: gui/orderpanel/address.php
===================================================================
--- gui/orderpanel/address.php (revision 2801)
+++ gui/orderpanel/address.php (working copy)
@@ -31,7 +31,7 @@
require '../include/ispcp-lib.php';
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('PURCHASE_TEMPLATE_PATH') . '/address.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('PURCHASE_TEMPLATE_PATH') . '/address.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('purchase_header', 'page');
$tpl->define_dynamic('purchase_footer', 'page');
@@ -283,7 +283,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
Index: gui/orderpanel/chart.php
===================================================================
--- gui/orderpanel/chart.php (revision 2801)
+++ gui/orderpanel/chart.php (working copy)
@@ -31,7 +31,7 @@
require '../include/ispcp-lib.php';
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('PURCHASE_TEMPLATE_PATH') . '/chart.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('PURCHASE_TEMPLATE_PATH') . '/chart.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('purchase_header', 'page');
$tpl->define_dynamic('tos_field', 'page');
@@ -43,8 +43,8 @@
*/
function gen_chart(&$tpl, &$sql, $user_id, $plan_id) {
- if (Config::exists('HOSTING_PLANS_LEVEL')
- && Config::get('HOSTING_PLANS_LEVEL') === 'admin') {
+ if (Config::getInstance()->exists('HOSTING_PLANS_LEVEL')
+ && Config::getInstance()->get('HOSTING_PLANS_LEVEL') === 'admin') {
$query = "
SELECT
*
@@ -206,7 +206,7 @@
'TR_PERSONAL_DATA' => tr('Personal Data'),
'TR_CAPCODE' => tr('Security code'),
'TR_IMGCAPCODE_DESCRIPTION' => tr('(To avoid abuse, we ask you to write the combination of letters on the above picture into the field "Security code")'),
- 'TR_IMGCAPCODE' => '
',
+ 'TR_IMGCAPCODE' => '',
'THEME_CHARSET' => tr('encoding'),
)
);
@@ -214,7 +214,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
Index: gui/orderpanel/checkout.php
===================================================================
--- gui/orderpanel/checkout.php (revision 2801)
+++ gui/orderpanel/checkout.php (working copy)
@@ -31,7 +31,7 @@
require '../include/ispcp-lib.php';
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('PURCHASE_TEMPLATE_PATH') . '/checkout.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('PURCHASE_TEMPLATE_PATH') . '/checkout.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('purchase_header', 'page');
$tpl->define_dynamic('purchase_footer', 'page');
@@ -176,6 +176,6 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
Index: gui/orderpanel/index.php
===================================================================
--- gui/orderpanel/index.php (revision 2801)
+++ gui/orderpanel/index.php (working copy)
@@ -32,7 +32,7 @@
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('PURCHASE_TEMPLATE_PATH') . '/index.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('PURCHASE_TEMPLATE_PATH') . '/index.tpl');
$tpl->define_dynamic('purchase_list', 'page');
$tpl->define_dynamic('purchase_message', 'page');
$tpl->define_dynamic('purchase_header', 'page');
@@ -43,8 +43,8 @@
*/
function gen_packages_list(&$tpl, &$sql, $user_id) {
- if (Config::exists('HOSTING_PLANS_LEVEL')
- && Config::get('HOSTING_PLANS_LEVEL') === 'admin') {
+ if (Config::getInstance()->exists('HOSTING_PLANS_LEVEL')
+ && Config::getInstance()->get('HOSTING_PLANS_LEVEL') === 'admin') {
$query = "
SELECT
t1.*,
@@ -118,7 +118,7 @@
* static page messages.
*
*/
-$coid = Config::exists('CUSTOM_ORDERPANEL_ID') ? Config::get('CUSTOM_ORDERPANEL_ID'): '';
+$coid = Config::getInstance()->exists('CUSTOM_ORDERPANEL_ID') ? Config::getInstance()->get('CUSTOM_ORDERPANEL_ID'): '';
$bcoid = (empty($coid) || (isset($_GET['coid']) && $_GET['coid'] == $coid));
if (isset($_GET['user_id']) && is_numeric($_GET['user_id']) && $bcoid) {
@@ -145,7 +145,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
Index: gui/orderpanel/package_info.php
===================================================================
--- gui/orderpanel/package_info.php (revision 2801)
+++ gui/orderpanel/package_info.php (working copy)
@@ -32,7 +32,7 @@
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('PURCHASE_TEMPLATE_PATH') . '/package_info.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('PURCHASE_TEMPLATE_PATH') . '/package_info.tpl');
$tpl->define_dynamic('purchase_list', 'page');
$tpl->define_dynamic('purchase_message', 'page');
$tpl->define_dynamic('purchase_header', 'page');
@@ -60,8 +60,8 @@
}
function gen_plan_details(&$tpl, &$sql, $user_id, $plan_id) {
- if (Config::exists('HOSTING_PLANS_LEVEL')
- && Config::get('HOSTING_PLANS_LEVEL') === 'admin') {
+ if (Config::getInstance()->exists('HOSTING_PLANS_LEVEL')
+ && Config::getInstance()->get('HOSTING_PLANS_LEVEL') === 'admin') {
$query = "
SELECT
*
@@ -113,7 +113,7 @@
$hp_traff = translate_limit_value($hp_traff, true);
- $coid = Config::exists('CUSTOM_ORDERPANEL_ID') ? Config::get('CUSTOM_ORDERPANEL_ID'): '';
+ $coid = Config::getInstance()->exists('CUSTOM_ORDERPANEL_ID') ? Config::getInstance()->get('CUSTOM_ORDERPANEL_ID'): '';
$tpl->assign(
array(
@@ -156,7 +156,7 @@
*
*/
-$coid = Config::exists('CUSTOM_ORDERPANEL_ID') ? Config::get('CUSTOM_ORDERPANEL_ID'): '';
+$coid = Config::getInstance()->exists('CUSTOM_ORDERPANEL_ID') ? Config::getInstance()->get('CUSTOM_ORDERPANEL_ID'): '';
$bcoid = (empty($coid) || (isset($_GET['coid']) && $_GET['coid'] == $coid));
if (isset($_GET['id']) && $bcoid) {
@@ -227,7 +227,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
Index: gui/reseller/alias.php
===================================================================
--- gui/reseller/alias.php (revision 2801)
+++ gui/reseller/alias.php (working copy)
@@ -34,7 +34,7 @@
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('RESELLER_TEMPLATE_PATH') . '/domain_alias.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/domain_alias.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('table_list', 'page');
@@ -43,7 +43,7 @@
$tpl->define_dynamic('scroll_next_gray', 'page');
$tpl->define_dynamic('scroll_next', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -60,8 +60,8 @@
*
*/
-gen_reseller_mainmenu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
-gen_reseller_menu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/menu_users_manage.tpl');
+gen_reseller_mainmenu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
+gen_reseller_menu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/menu_users_manage.tpl');
gen_logged_from($tpl);
@@ -88,7 +88,7 @@
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
@@ -105,7 +105,7 @@
$start_index = 0;
- $rows_per_page = Config::get('DOMAIN_ROWS_PER_PAGE');
+ $rows_per_page = Config::getInstance()->get('DOMAIN_ROWS_PER_PAGE');
$current_psi = 0;
$_SESSION['search_for'] = '';
@@ -330,12 +330,12 @@
$page_cont = ($i % 2 == 0) ? 'content' : 'content2';
- if ($als_status === Config::get('ITEM_OK_STATUS')) {
+ if ($als_status === Config::getInstance()->get('ITEM_OK_STATUS')) {
$delete_link = "alias_delete.php?del_id=" . $als_id;
$edit_link = "alias_edit.php?edit_id=" . $als_id;
$action_text = tr("Delete");
$edit_text = tr("Edit");
- } else if ($als_status === Config::get('ITEM_ORDERED_STATUS')) {
+ } else if ($als_status === Config::getInstance()->get('ITEM_ORDERED_STATUS')) {
$delete_link = "alias_order.php?action=delete&del_id=".$als_id;
$edit_link = "alias_order.php?action=activate&act_id=".$als_id;
$action_text = tr("Delete order");
Index: gui/reseller/alias_add.php
===================================================================
--- gui/reseller/alias_add.php (revision 2801)
+++ gui/reseller/alias_add.php (working copy)
@@ -33,13 +33,13 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('RESELLER_TEMPLATE_PATH') . '/alias_add.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/alias_add.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('user_entry', 'page');
$tpl->define_dynamic('ip_entry', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -55,8 +55,8 @@
* static page messages.
*/
-gen_reseller_mainmenu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
-gen_reseller_menu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/menu_users_manage.tpl');
+gen_reseller_mainmenu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
+gen_reseller_menu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/menu_users_manage.tpl');
gen_logged_from($tpl);
@@ -120,7 +120,7 @@
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
// Begin function declaration lines
@@ -240,7 +240,7 @@
$err_al = tr('Domain with that name already exists on the system!');
} else if (!validates_mpoint($mount_point) && $mount_point != '/') {
$err_al = tr("Incorrect mount point syntax");
- } else if ($alias_name == Config::get('BASE_SERVER_VHOST')) {
+ } else if ($alias_name == Config::getInstance()->get('BASE_SERVER_VHOST')) {
$err_al = tr('Master domain cannot be used!');
} else if ($_POST['status'] == 1) {
if(substr_count($forward, '.') <= 2) {
@@ -282,7 +282,7 @@
// Begin add new alias domain
$alias_name = htmlspecialchars($alias_name, ENT_QUOTES, "UTF-8");
check_for_lock_file();
- $status = Config::get('ITEM_ADD_STATUS');
+ $status = Config::getInstance()->get('ITEM_ADD_STATUS');
exec_query($sql,
"INSERT INTO `domain_aliasses` (`domain_id`, `alias_name`, `alias_mount`, ".
@@ -298,7 +298,7 @@
$user_email = $rs->fields['email'];
// Create the 3 default addresses if wanted
- if (Config::get('CREATE_DEFAULT_EMAIL_ADDRESSES'))
+ if (Config::getInstance()->get('CREATE_DEFAULT_EMAIL_ADDRESSES'))
client_mail_add_default_accounts($cr_user_id, $user_email, $alias_name, 'alias', $als_id);
send_request();
Index: gui/reseller/alias_delete.php
===================================================================
--- gui/reseller/alias_delete.php (revision 2801)
+++ gui/reseller/alias_delete.php (working copy)
@@ -32,7 +32,7 @@
check_login(__FILE__);
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
if (isset($_GET['del_id']))
$del_id = $_GET['del_id'];
@@ -64,7 +64,7 @@
}
$alias_name = $rs->fields['alias_name'];
-$delete_status = Config::get('ITEM_DELETE_STATUS');
+$delete_status = Config::getInstance()->get('ITEM_DELETE_STATUS');
/* check for mail acc in ALIAS domain (ALIAS MAIL) and delete them */
$query = <<FetchRow();
-exec_query($sql, "UPDATE `subdomain_alias` SET `subdomain_alias_status` = '" . Config::get('ITEM_DELETE_STATUS') . "' WHERE `alias_id` = ?", array($del_id));
-exec_query($sql, "UPDATE `domain_aliasses` SET `alias_status` = '" . Config::get('ITEM_DELETE_STATUS') . "' WHERE `alias_id` = ?", array($del_id));
+exec_query($sql, "UPDATE `subdomain_alias` SET `subdomain_alias_status` = '" . Config::getInstance()->get('ITEM_DELETE_STATUS') . "' WHERE `alias_id` = ?", array($del_id));
+exec_query($sql, "UPDATE `domain_aliasses` SET `alias_status` = '" . Config::getInstance()->get('ITEM_DELETE_STATUS') . "' WHERE `alias_id` = ?", array($del_id));
update_reseller_c_props($reseller_id);
Index: gui/reseller/alias_edit.php
===================================================================
--- gui/reseller/alias_edit.php (revision 2801)
+++ gui/reseller/alias_edit.php (working copy)
@@ -33,11 +33,11 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('RESELLER_TEMPLATE_PATH') . '/alias_edit.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/alias_edit.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -72,8 +72,8 @@
)
);
-gen_reseller_mainmenu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
-gen_reseller_menu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/menu_users_manage.tpl');
+gen_reseller_mainmenu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
+gen_reseller_menu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/menu_users_manage.tpl');
gen_logged_from($tpl);
@@ -109,7 +109,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
@@ -267,7 +267,7 @@
WHERE
`alias_id` = ?
";
- exec_query($sql, $query, array($forward_url, Config::get('ITEM_CHANGE_STATUS'), $alias_id));
+ exec_query($sql, $query, array($forward_url, Config::getInstance()->get('ITEM_CHANGE_STATUS'), $alias_id));
$query = "
UPDATE
@@ -277,7 +277,7 @@
WHERE
`alias_id` = ?
";
- exec_query($sql, $query, array(Config::get('ITEM_CHANGE_STATUS'), $alias_id));
+ exec_query($sql, $query, array(Config::getInstance()->get('ITEM_CHANGE_STATUS'), $alias_id));
send_request();
Index: gui/reseller/alias_order.php
===================================================================
--- gui/reseller/alias_order.php (revision 2801)
+++ gui/reseller/alias_order.php (working copy)
@@ -32,7 +32,7 @@
check_login(__FILE__);
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
if (isset($_GET['action']) && $_GET['action'] === "delete") {
@@ -49,7 +49,7 @@
// delete "ordered"/pending email accounts
$domain_id = who_owns_this($del_id, 'als_id', true);
$query = "DELETE FROM `mail_users` WHERE `sub_id` = ? AND `domain_id` = ? AND `status` = ? AND `mail_type` LIKE 'alias%'";
- $rs = exec_query($sql, $query, array($del_id, $domain_id, Config::get('ITEM_ORDERED_STATUS')));
+ $rs = exec_query($sql, $query, array($del_id, $domain_id, Config::getInstance()->get('ITEM_ORDERED_STATUS')));
user_goto('alias.php');
@@ -79,12 +79,12 @@
}
$user_email = $rs->fields['email'];
// Create the 3 default addresses if wanted
- if (Config::get('CREATE_DEFAULT_EMAIL_ADDRESSES')) client_mail_add_default_accounts($domain_id, $user_email, $alias_name, 'alias', $act_id);
+ if (Config::getInstance()->get('CREATE_DEFAULT_EMAIL_ADDRESSES')) client_mail_add_default_accounts($domain_id, $user_email, $alias_name, 'alias', $act_id);
// enable "ordered"/pending email accounts
// ??? are there pending mail_addresses ???, joximu
$query = "UPDATE `mail_users` SET `status` = ? WHERE `sub_id` = ? AND `domain_id` = ? AND `status` = ? AND `mail_type` LIKE 'alias%'";
- $rs = exec_query($sql, $query, array(Config::get('ITEM_ADD_STATUS'), $act_id, $domain_id, Config::get('ITEM_ORDERED_STATUS')));
+ $rs = exec_query($sql, $query, array(Config::getInstance()->get('ITEM_ADD_STATUS'), $act_id, $domain_id, Config::getInstance()->get('ITEM_ORDERED_STATUS')));
send_request();
Index: gui/reseller/circular.php
===================================================================
--- gui/reseller/circular.php (revision 2801)
+++ gui/reseller/circular.php (working copy)
@@ -33,12 +33,12 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('RESELLER_TEMPLATE_PATH') . '/circular.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/circular.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('alias_menu', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -188,8 +188,8 @@
*
*/
-gen_reseller_mainmenu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
-gen_reseller_menu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/menu_users_manage.tpl');
+gen_reseller_mainmenu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
+gen_reseller_menu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/menu_users_manage.tpl');
gen_logged_from($tpl);
@@ -222,7 +222,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/reseller/domain_delete.php
===================================================================
--- gui/reseller/domain_delete.php (revision 2801)
+++ gui/reseller/domain_delete.php (working copy)
@@ -32,7 +32,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('RESELLER_TEMPLATE_PATH') . '/domain_delete.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/domain_delete.tpl');
$tpl->define_dynamic('mail_list', 'page');
$tpl->define_dynamic('ftp_list', 'page');
@@ -49,7 +49,7 @@
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -70,8 +70,8 @@
user_goto('users.php');
}
-gen_reseller_mainmenu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
-gen_reseller_menu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/menu_users_manage.tpl');
+gen_reseller_mainmenu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
+gen_reseller_menu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/menu_users_manage.tpl');
gen_logged_from($tpl);
@@ -80,7 +80,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
@@ -107,7 +107,7 @@
$domain_uid = $data['domain_uid'];
$domain_gid = $data['domain_gid'];
- $delete_status = Config::get('ITEM_DELETE_STATUS');
+ $delete_status = Config::getInstance()->get('ITEM_DELETE_STATUS');
// Mail users:
exec_query($sql, "UPDATE `mail_users` SET `status` = '" . $delete_status . "' WHERE `domain_id` = ?", array($domain_id));
Index: gui/reseller/domain_details.php
===================================================================
--- gui/reseller/domain_details.php (revision 2801)
+++ gui/reseller/domain_details.php (working copy)
@@ -33,10 +33,10 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('RESELLER_TEMPLATE_PATH') . '/domain_details.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/domain_details.tpl');
$tpl->define_dynamic('logged_from', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -80,13 +80,13 @@
)
);
-if (Config::exists('HOSTING_PLANS_LEVEL')
- && Config::get('HOSTING_PLANS_LEVEL') === 'admin') {
+if (Config::getInstance()->exists('HOSTING_PLANS_LEVEL')
+ && Config::getInstance()->get('HOSTING_PLANS_LEVEL') === 'admin') {
$tpl->assign('EDIT_OPTION', '');
}
-gen_reseller_mainmenu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
-gen_reseller_menu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/menu_users_manage.tpl');
+gen_reseller_mainmenu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
+gen_reseller_menu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/menu_users_manage.tpl');
gen_logged_from($tpl);
@@ -103,7 +103,7 @@
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
@@ -215,7 +215,7 @@
. "FROM `mail_users` "
. "WHERE `domain_id` = ? "
. "AND `mail_type` NOT RLIKE '_catchall' ";
- if (Config::get('COUNT_DEFAULT_EMAIL_ADDRESSES') == 0) {
+ if (Config::getInstance()->get('COUNT_DEFAULT_EMAIL_ADDRESSES') == 0) {
$query .= "AND `mail_acc` != 'abuse' "
. "AND `mail_acc` != 'postmaster' "
. "AND `mail_acc` != 'webmaster'";
Index: gui/reseller/domain_edit.php
===================================================================
--- gui/reseller/domain_edit.php (revision 2801)
+++ gui/reseller/domain_edit.php (working copy)
@@ -33,15 +33,15 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('RESELLER_TEMPLATE_PATH') . '/domain_edit.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/domain_edit.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('ip_entry', 'page');
$tpl->define_dynamic('logged_from', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
-if (Config::exists('HOSTING_PLANS_LEVEL')
- && Config::get('HOSTING_PLANS_LEVEL') === 'admin') {
+if (Config::getInstance()->exists('HOSTING_PLANS_LEVEL')
+ && Config::getInstance()->get('HOSTING_PLANS_LEVEL') === 'admin') {
user_goto('users.php');
}
@@ -101,8 +101,8 @@
)
);
-gen_reseller_mainmenu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
-gen_reseller_menu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/menu_users_manage.tpl');
+gen_reseller_mainmenu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
+gen_reseller_menu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/menu_users_manage.tpl');
gen_logged_from($tpl);
@@ -221,7 +221,7 @@
if ($domain_expires == 0) {
$domain_expires = tr('N/A');
} else {
- $date_formt = Config::get('DATE_FORMAT');
+ $date_formt = Config::getInstance()->get('DATE_FORMAT');
$domain_expires = date($date_formt, $domain_expires);
}
@@ -694,7 +694,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/reseller/domain_statistics.php
===================================================================
--- gui/reseller/domain_statistics.php (revision 2801)
+++ gui/reseller/domain_statistics.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('RESELLER_TEMPLATE_PATH') . '/domain_statistics.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/domain_statistics.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('month_list', 'page');
@@ -41,7 +41,7 @@
$tpl->define_dynamic('traffic_table', 'page');
$tpl->define_dynamic('traffic_table_item', 'traffic_table');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -163,7 +163,7 @@
$has_data = false;
list($web_trf, $ftp_trf, $pop_trf, $smtp_trf) = get_domain_trafic($ftm, $ltm, $domain_id);
- $date_formt = Config::get('DATE_FORMAT');
+ $date_formt = Config::getInstance()->get('DATE_FORMAT');
if ($web_trf == 0 && $ftp_trf == 0 && $smtp_trf == 0 && $pop_trf == 0) {
$tpl->assign(
array(
@@ -223,8 +223,8 @@
*
*/
-gen_reseller_mainmenu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/main_menu_statistics.tpl');
-gen_reseller_menu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/menu_statistics.tpl');
+gen_reseller_mainmenu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/main_menu_statistics.tpl');
+gen_reseller_menu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/menu_statistics.tpl');
gen_logged_from($tpl);
@@ -251,7 +251,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/reseller/domain_status_change.php
===================================================================
--- gui/reseller/domain_status_change.php (revision 2801)
+++ gui/reseller/domain_status_change.php (working copy)
@@ -64,12 +64,12 @@
$location = 'reseller';
-if ($rs->fields['domain_status'] == Config::get('ITEM_OK_STATUS')) {
+if ($rs->fields['domain_status'] == Config::getInstance()->get('ITEM_OK_STATUS')) {
//disable_domain($sql, $domain_id, $rs->fields['domain_name']);
$action = "disable";
change_domain_status($sql, $domain_id, $rs->fields['domain_name'], $action, $location);
-} else if ($rs->fields['domain_status'] == Config::get('ITEM_DISABLED_STATUS')) {
+} else if ($rs->fields['domain_status'] == Config::getInstance()->get('ITEM_DISABLED_STATUS')) {
//enable_domain($sql, $domain_id, $rs->fields['domain_name']);
$action = "enable";
Index: gui/reseller/hosting_plan.php
===================================================================
--- gui/reseller/hosting_plan.php (revision 2801)
+++ gui/reseller/hosting_plan.php (working copy)
@@ -34,7 +34,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('RESELLER_TEMPLATE_PATH') . '/hosting_plan.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/hosting_plan.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
// Table with hosting plans
@@ -43,7 +43,7 @@
$tpl->define_dynamic('hp_delete', 'page');
$tpl->define_dynamic('hp_menu_add', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -60,8 +60,8 @@
*
*/
-gen_reseller_mainmenu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/main_menu_hosting_plan.tpl');
-gen_reseller_menu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/menu_hosting_plan.tpl');
+gen_reseller_mainmenu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/main_menu_hosting_plan.tpl');
+gen_reseller_menu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/menu_hosting_plan.tpl');
gen_logged_from($tpl);
@@ -129,8 +129,8 @@
$sql = Database::getInstance();
- if (Config::exists('HOSTING_PLANS_LEVEL')
- && Config::get('HOSTING_PLANS_LEVEL') === 'admin') {
+ if (Config::getInstance()->exists('HOSTING_PLANS_LEVEL')
+ && Config::getInstance()->get('HOSTING_PLANS_LEVEL') === 'admin') {
$query = <<exists('CUSTOM_ORDERPANEL_ID') ? Config::getInstance()->get('CUSTOM_ORDERPANEL_ID'): '';
$i = 1;
while ($data = $rs->FetchRow()) {
@@ -220,7 +220,7 @@
// ******************************
// END OF FUNCTION DECLARE PATH
// *****************************
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/reseller/hosting_plan_add.php
===================================================================
--- gui/reseller/hosting_plan_add.php (revision 2801)
+++ gui/reseller/hosting_plan_add.php (working copy)
@@ -32,17 +32,17 @@
check_login(__FILE__);
-if (Config::exists('HOSTING_PLANS_LEVEL') &&
- strtolower(Config::get('HOSTING_PLANS_LEVEL')) == 'admin') {
+if (Config::getInstance()->exists('HOSTING_PLANS_LEVEL') &&
+ strtolower(Config::getInstance()->get('HOSTING_PLANS_LEVEL')) == 'admin') {
user_goto('hosting_plan.php');
}
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('RESELLER_TEMPLATE_PATH') . '/hosting_plan_add.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/hosting_plan_add.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -59,8 +59,8 @@
*
*/
-gen_reseller_mainmenu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/main_menu_hosting_plan.tpl');
-gen_reseller_menu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/menu_hosting_plan.tpl');
+gen_reseller_mainmenu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/main_menu_hosting_plan.tpl');
+gen_reseller_menu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/menu_hosting_plan.tpl');
gen_logged_from($tpl);
@@ -123,7 +123,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
Index: gui/reseller/hosting_plan_delete.php
===================================================================
--- gui/reseller/hosting_plan_delete.php (revision 2801)
+++ gui/reseller/hosting_plan_delete.php (working copy)
@@ -32,7 +32,7 @@
check_login(__FILE__);
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
if (isset($_GET['hpid']) && is_numeric($_GET['hpid']))
$hpid = $_GET['hpid'];
Index: gui/reseller/hosting_plan_edit.php
===================================================================
--- gui/reseller/hosting_plan_edit.php (revision 2801)
+++ gui/reseller/hosting_plan_edit.php (working copy)
@@ -36,13 +36,13 @@
$tpl->define_dynamic(
'page',
- Config::get('RESELLER_TEMPLATE_PATH') . '/hosting_plan_edit.tpl'
+ Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/hosting_plan_edit.tpl'
);
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
/**
* static page messages.
@@ -53,12 +53,12 @@
// Show main menu
gen_reseller_mainmenu(
$tpl,
- Config::get('RESELLER_TEMPLATE_PATH') . '/main_menu_hosting_plan.tpl'
+ Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/main_menu_hosting_plan.tpl'
);
gen_reseller_menu(
$tpl,
- Config::get('RESELLER_TEMPLATE_PATH') . '/menu_hosting_plan.tpl'
+ Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/menu_hosting_plan.tpl'
);
gen_logged_from($tpl);
@@ -154,7 +154,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
@@ -208,8 +208,8 @@
$_SESSION['hpid'] = $hpid;
- if (Config::exists('HOSTING_PLANS_LEVEL') &&
- Config::get('HOSTING_PLANS_LEVEL') === 'admin') {
+ if (Config::getInstance()->exists('HOSTING_PLANS_LEVEL') &&
+ Config::getInstance()->get('HOSTING_PLANS_LEVEL') === 'admin') {
$query = "
SELECT
*
Index: gui/reseller/index.php
===================================================================
--- gui/reseller/index.php (revision 2801)
+++ gui/reseller/index.php (working copy)
@@ -30,12 +30,12 @@
require '../include/ispcp-lib.php';
-check_login(__FILE__, Config::get('PREVENT_EXTERNAL_LOGIN_RESELLER'));
+check_login(__FILE__, Config::getInstance()->get('PREVENT_EXTERNAL_LOGIN_RESELLER'));
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('RESELLER_TEMPLATE_PATH') . '/index.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/index.tpl');
$tpl->define_dynamic('def_language', 'page');
$tpl->define_dynamic('def_layout', 'page');
$tpl->define_dynamic('no_messages', 'page');
@@ -346,8 +346,8 @@
gen_def_layout($tpl, $user_def_layout);
-gen_reseller_mainmenu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/main_menu_general_information.tpl');
-gen_reseller_menu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/menu_general_information.tpl');
+gen_reseller_mainmenu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/main_menu_general_information.tpl');
+gen_reseller_menu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/menu_general_information.tpl');
gen_system_message($tpl, $sql);
@@ -359,7 +359,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/reseller/language.php
===================================================================
--- gui/reseller/language.php (revision 2801)
+++ gui/reseller/language.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('RESELLER_TEMPLATE_PATH') . '/language.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/language.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('def_language', 'page');
$tpl->define_dynamic('logged_from', 'page');
@@ -65,7 +65,7 @@
set_page_message(tr('User language updated successfully!'));
}
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
// Makes sure that the language selected is the reseller's language
if (!isset($_SESSION['logged_from']) && !isset($_SESSION['logged_from_id'])) {
@@ -92,8 +92,8 @@
*
*/
-gen_reseller_mainmenu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/main_menu_general_information.tpl');
-gen_reseller_menu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/menu_general_information.tpl');
+gen_reseller_mainmenu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/main_menu_general_information.tpl');
+gen_reseller_menu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/menu_general_information.tpl');
gen_logged_from($tpl);
@@ -112,7 +112,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/reseller/order_email.php
===================================================================
--- gui/reseller/order_email.php (revision 2801)
+++ gui/reseller/order_email.php (working copy)
@@ -33,11 +33,11 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('RESELLER_TEMPLATE_PATH') . '/order_email.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/order_email.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$user_id = $_SESSION['user_id'];
@@ -74,8 +74,8 @@
)
);
-gen_reseller_mainmenu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/main_menu_orders.tpl');
-gen_reseller_menu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/menu_orders.tpl');
+gen_reseller_mainmenu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/main_menu_orders.tpl');
+gen_reseller_menu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/menu_orders.tpl');
gen_logged_from($tpl);
@@ -106,7 +106,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/reseller/order_settings.php
===================================================================
--- gui/reseller/order_settings.php (revision 2801)
+++ gui/reseller/order_settings.php (working copy)
@@ -35,7 +35,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('RESELLER_TEMPLATE_PATH') . '/order_settings.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/order_settings.tpl');
$tpl->define_dynamic('logged_from', 'page');
// Table with orders
$tpl->define_dynamic('purchase_header', 'page');
@@ -43,7 +43,7 @@
$tpl->define_dynamic('purchase_footer', 'page');
$tpl->define_dynamic('page_message', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -112,14 +112,14 @@
}
gen_purchase_haf($tpl, $sql, $_SESSION['user_id'], true);
-gen_reseller_mainmenu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/main_menu_orders.tpl');
-gen_reseller_menu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/menu_orders.tpl');
+gen_reseller_mainmenu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/main_menu_orders.tpl');
+gen_reseller_menu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/menu_orders.tpl');
gen_logged_from($tpl);
-$coid = Config::exists('CUSTOM_ORDERPANEL_ID') ? Config::get('CUSTOM_ORDERPANEL_ID'): '';
+$coid = Config::getInstance()->exists('CUSTOM_ORDERPANEL_ID') ? Config::getInstance()->get('CUSTOM_ORDERPANEL_ID'): '';
-$url = Config::get('BASE_SERVER_VHOST_PREFIX') . Config::get('BASE_SERVER_VHOST') . '/orderpanel/index.php?';
+$url = Config::getInstance()->get('BASE_SERVER_VHOST_PREFIX') . Config::getInstance()->get('BASE_SERVER_VHOST') . '/orderpanel/index.php?';
$url .= 'coid='.$coid;
$url .= '&user_id=' . $_SESSION['user_id'];
@@ -140,7 +140,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/reseller/orders.php
===================================================================
--- gui/reseller/orders.php (revision 2801)
+++ gui/reseller/orders.php (working copy)
@@ -34,7 +34,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('RESELLER_TEMPLATE_PATH') . '/orders.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/orders.tpl');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('page_message', 'page');
// Table with orders
@@ -46,7 +46,7 @@
$tpl->define_dynamic('scroll_next_gray', 'page');
$tpl->define_dynamic('scroll_next', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -70,7 +70,7 @@
$current_psi = $_GET['psi'];
}
- $rows_per_page = Config::get('DOMAIN_ROWS_PER_PAGE');
+ $rows_per_page = Config::getInstance()->get('DOMAIN_ROWS_PER_PAGE');
// count query
$count_query = "
SELECT
@@ -198,8 +198,8 @@
gen_order_page($tpl, $sql, $_SESSION['user_id']);
-gen_reseller_mainmenu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/main_menu_orders.tpl');
-gen_reseller_menu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/menu_orders.tpl');
+gen_reseller_mainmenu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/main_menu_orders.tpl');
+gen_reseller_menu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/menu_orders.tpl');
gen_logged_from($tpl);
@@ -225,7 +225,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/reseller/orders_add.php
===================================================================
--- gui/reseller/orders_add.php (revision 2801)
+++ gui/reseller/orders_add.php (working copy)
@@ -41,8 +41,8 @@
user_goto('orders.php');
}
-if (Config::exists('HOSTING_PLANS_LEVEL')
- && Config::get('HOSTING_PLANS_LEVEL') === 'admin') {
+if (Config::getInstance()->exists('HOSTING_PLANS_LEVEL')
+ && Config::getInstance()->get('HOSTING_PLANS_LEVEL') === 'admin') {
$query = "
SELECT
*
@@ -92,8 +92,8 @@
// let's check the reseller limits
$err_msg = '';
-if (Config::exists('HOSTING_PLANS_LEVEL')
- && Config::get('HOSTING_PLANS_LEVEL') === 'admin') {
+if (Config::getInstance()->exists('HOSTING_PLANS_LEVEL')
+ && Config::getInstance()->get('HOSTING_PLANS_LEVEL') === 'admin') {
$query = "SELECT `props` FROM `hosting_plans` WHERE `id` = ?";
$res = exec_query($sql, $query, array($hpid));
} else {
@@ -182,7 +182,7 @@
$rs = exec_query($sql, $query, array($reseller_id));
$domain_ip = $rs->fields['reseller_ips'];
-$status = Config::get('ITEM_ADD_STATUS');
+$status = Config::getInstance()->get('ITEM_ADD_STATUS');
$query = "
@@ -227,7 +227,7 @@
$user_id = $sql->Insert_ID();
-$awstats_auth = Config::get('AWSTATS_GROUP_AUTH');
+$awstats_auth = Config::getInstance()->get('AWSTATS_GROUP_AUTH');
$query = "
INSERT INTO `htaccess_groups`
@@ -238,7 +238,7 @@
$rs = exec_query($sql, $query, array($dmn_id, $awstats_auth, $user_id, $status));
// Create the 3 default addresses if wanted
-if (Config::get('CREATE_DEFAULT_EMAIL_ADDRESSES'))
+if (Config::getInstance()->get('CREATE_DEFAULT_EMAIL_ADDRESSES'))
client_mail_add_default_accounts($dmn_id, $user_email, $dmn_user_name); // 'domain', 0
// Added to send the msg with the domain name in idna form
Index: gui/reseller/orders_detailst.php
===================================================================
--- gui/reseller/orders_detailst.php (revision 2801)
+++ gui/reseller/orders_detailst.php (working copy)
@@ -34,12 +34,12 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('RESELLER_TEMPLATE_PATH') . '/orders_detailst.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/orders_detailst.tpl');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('ip_entry', 'page');
$tpl->define_dynamic('page_message', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -72,7 +72,7 @@
}
$plan_id = $rs->fields['plan_id'];
- $date_formt = Config::get('DATE_FORMAT');
+ $date_formt = Config::getInstance()->get('DATE_FORMAT');
$date = date($date_formt, $rs->fields['date']);
if (isset($_POST['uaction'])) {
@@ -222,8 +222,8 @@
gen_order_details($tpl, $sql, $_SESSION['user_id'], $order_id);
-gen_reseller_mainmenu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/main_menu_orders.tpl');
-gen_reseller_menu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/menu_orders.tpl');
+gen_reseller_mainmenu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/main_menu_orders.tpl');
+gen_reseller_menu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/menu_orders.tpl');
gen_logged_from($tpl);
@@ -266,7 +266,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/reseller/orders_update.php
===================================================================
--- gui/reseller/orders_update.php (revision 2801)
+++ gui/reseller/orders_update.php (working copy)
@@ -41,8 +41,8 @@
user_goto('orders.php');
}
-if (Config::exists('HOSTING_PLANS_LEVEL')
- && Config::get('HOSTING_PLANS_LEVEL') === 'admin') {
+if (Config::getInstance()->exists('HOSTING_PLANS_LEVEL')
+ && Config::getInstance()->get('HOSTING_PLANS_LEVEL') === 'admin') {
$query = "
SELECT
*
@@ -83,8 +83,8 @@
// let's check the reseller limits
$err_msg = '';
-if (Config::exists('HOSTING_PLANS_LEVEL')
- && Config::get('HOSTING_PLANS_LEVEL') === 'admin') {
+if (Config::getInstance()->exists('HOSTING_PLANS_LEVEL')
+ && Config::getInstance()->get('HOSTING_PLANS_LEVEL') === 'admin') {
$query = "SELECT `props` FROM `hosting_plans` WHERE `id` = ?";
$res = exec_query($sql, $query, $hpid);
} else {
@@ -117,7 +117,7 @@
$domain_cgi = preg_replace("/\_/", "", $domain_cgi);
$domain_dns = preg_replace("/\_/", "", $domain_dns);
-if (Config::get('COUNT_DEFAULT_EMAIL_ADDRESSES') == 0) {
+if (Config::getInstance()->get('COUNT_DEFAULT_EMAIL_ADDRESSES') == 0) {
$query = "SELECT COUNT(`mail_id`) AS cnt
FROM `mail_users`
WHERE `domain_id` = ?
@@ -190,7 +190,7 @@
}
if (empty($ed_error)) {
- if (Config::get('COUNT_DEFAULT_EMAIL_ADDRESSES') == 0) {
+ if (Config::getInstance()->get('COUNT_DEFAULT_EMAIL_ADDRESSES') == 0) {
$umail_max -= $default_mails;
}
Index: gui/reseller/password_change.php
===================================================================
--- gui/reseller/password_change.php (revision 2801)
+++ gui/reseller/password_change.php (working copy)
@@ -33,11 +33,11 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('RESELLER_TEMPLATE_PATH') . '/password_change.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/password_change.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -54,10 +54,10 @@
} else if ($_POST['pass'] !== $_POST['pass_rep']) {
set_page_message(tr('Passwords do not match!'));
} else if (!chk_password($_POST['pass'])) {
- if (Config::get('PASSWD_STRONG')) {
- set_page_message(sprintf(tr('The password must be at least %s long and contain letters and numbers to be valid.'), Config::get('PASSWD_CHARS')));
+ if (Config::getInstance()->get('PASSWD_STRONG')) {
+ set_page_message(sprintf(tr('The password must be at least %s long and contain letters and numbers to be valid.'), Config::getInstance()->get('PASSWD_CHARS')));
} else {
- set_page_message(sprintf(tr('Password data is shorter than %s signs or includes not permitted signs!'), Config::get('PASSWD_CHARS')));
+ set_page_message(sprintf(tr('Password data is shorter than %s signs or includes not permitted signs!'), Config::getInstance()->get('PASSWD_CHARS')));
}
} else if (check_udata($_SESSION['user_id'], $_POST['curr_pass']) === false) {
set_page_message(tr('The current password is wrong!'));
@@ -109,8 +109,8 @@
*
*/
-gen_reseller_mainmenu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/main_menu_general_information.tpl');
-gen_reseller_menu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/menu_general_information.tpl');
+gen_reseller_mainmenu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/main_menu_general_information.tpl');
+gen_reseller_menu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/menu_general_information.tpl');
gen_logged_from($tpl);
@@ -133,7 +133,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/reseller/personal_change.php
===================================================================
--- gui/reseller/personal_change.php (revision 2801)
+++ gui/reseller/personal_change.php (working copy)
@@ -33,11 +33,11 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('RESELLER_TEMPLATE_PATH') . '/personal_change.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/personal_change.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -147,8 +147,8 @@
*
*/
-gen_reseller_mainmenu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/main_menu_general_information.tpl');
-gen_reseller_menu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/menu_general_information.tpl');
+gen_reseller_mainmenu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/main_menu_general_information.tpl');
+gen_reseller_menu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/menu_general_information.tpl');
gen_logged_from($tpl);
@@ -181,7 +181,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/reseller/settings_layout.php
===================================================================
--- gui/reseller/settings_layout.php (revision 2801)
+++ gui/reseller/settings_layout.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('RESELLER_TEMPLATE_PATH') . '/settings_layout.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/settings_layout.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('def_layout', 'page');
@@ -43,11 +43,11 @@
update_logo();
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
gen_def_layout($tpl, $theme_color);
-if(get_own_logo($_SESSION['user_id']) !== Config::get('IPS_LOGO_PATH').'/isp_logo.gif') {
+if(get_own_logo($_SESSION['user_id']) !== Config::getInstance()->get('IPS_LOGO_PATH').'/isp_logo.gif') {
$tpl->parse('LOGO_REMOVE_BUTTON', '.logo_remove_button');
} else {
$tpl->assign('LOGO_REMOVE_BUTTON', '');
@@ -169,8 +169,8 @@
*
*/
-gen_reseller_mainmenu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/main_menu_general_information.tpl');
-gen_reseller_menu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/menu_general_information.tpl');
+gen_reseller_mainmenu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/main_menu_general_information.tpl');
+gen_reseller_menu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/menu_general_information.tpl');
gen_logged_from($tpl);
@@ -196,7 +196,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/reseller/settings_lostpassword.php
===================================================================
--- gui/reseller/settings_lostpassword.php (revision 2801)
+++ gui/reseller/settings_lostpassword.php (working copy)
@@ -33,13 +33,13 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('RESELLER_TEMPLATE_PATH') . '/settings_lostpassword.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/settings_lostpassword.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('custom_buttons', 'page');
$tpl->define_dynamic('alias_menu', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$user_id = $_SESSION['user_id'];
$selected_on = '';
@@ -89,8 +89,8 @@
)
);
-gen_reseller_mainmenu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
-gen_reseller_menu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/menu_users_manage.tpl');
+gen_reseller_mainmenu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
+gen_reseller_menu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/menu_users_manage.tpl');
gen_logged_from($tpl);
@@ -130,7 +130,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/reseller/settings_welcome_mail.php
===================================================================
--- gui/reseller/settings_welcome_mail.php (revision 2801)
+++ gui/reseller/settings_welcome_mail.php (working copy)
@@ -33,12 +33,12 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('RESELLER_TEMPLATE_PATH') . '/settings_welcome_mail.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/settings_welcome_mail.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('alias_menu', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$user_id = $_SESSION['user_id'];
@@ -75,8 +75,8 @@
)
);
-gen_reseller_mainmenu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
-gen_reseller_menu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/menu_users_manage.tpl');
+gen_reseller_mainmenu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
+gen_reseller_menu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/menu_users_manage.tpl');
gen_logged_from($tpl);
@@ -112,7 +112,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/reseller/ticket_closed.php
===================================================================
--- gui/reseller/ticket_closed.php (revision 2801)
+++ gui/reseller/ticket_closed.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('RESELLER_TEMPLATE_PATH') . '/ticket_closed.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/ticket_closed.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('tickets_list', 'page');
@@ -47,7 +47,7 @@
function gen_tickets_list(&$tpl, &$sql, $user_id) {
$start_index = 0;
- $rows_per_page = Config::get('DOMAIN_ROWS_PER_PAGE');
+ $rows_per_page = Config::getInstance()->get('DOMAIN_ROWS_PER_PAGE');
if (isset($_GET['psi'])) $start_index = $_GET['psi'];
@@ -170,11 +170,11 @@
$rs = exec_query($sql, $query, array($_SESSION['user_id']));
-if (!Config::get('ISPCP_SUPPORT_SYSTEM') || $rs->fields['support_system'] == 'no') {
+if (!Config::getInstance()->get('ISPCP_SUPPORT_SYSTEM') || $rs->fields['support_system'] == 'no') {
user_goto('index.php');
}
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -189,8 +189,8 @@
// static page messages.
-gen_reseller_mainmenu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/main_menu_ticket_system.tpl');
-gen_reseller_menu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/menu_ticket_system.tpl');
+gen_reseller_mainmenu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/main_menu_ticket_system.tpl');
+gen_reseller_menu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/menu_ticket_system.tpl');
gen_logged_from($tpl);
@@ -217,7 +217,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/reseller/ticket_create.php
===================================================================
--- gui/reseller/ticket_create.php (revision 2801)
+++ gui/reseller/ticket_create.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('RESELLER_TEMPLATE_PATH') . '/ticket_create.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/ticket_create.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
@@ -86,7 +86,7 @@
// common page data.
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -109,7 +109,7 @@
$rs = exec_query($sql, $query, array($_SESSION['user_id']));
-if (!Config::get('ISPCP_SUPPORT_SYSTEM') || $rs->fields['support_system'] == 'no') {
+if (!Config::getInstance()->get('ISPCP_SUPPORT_SYSTEM') || $rs->fields['support_system'] == 'no') {
user_goto('index.php');
}
@@ -117,8 +117,8 @@
// static page messages.
-gen_reseller_mainmenu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/main_menu_ticket_system.tpl');
-gen_reseller_menu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/menu_ticket_system.tpl');
+gen_reseller_mainmenu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/main_menu_ticket_system.tpl');
+gen_reseller_menu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/menu_ticket_system.tpl');
gen_logged_from($tpl);
@@ -169,7 +169,7 @@
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/reseller/ticket_delete.php
===================================================================
--- gui/reseller/ticket_delete.php (revision 2801)
+++ gui/reseller/ticket_delete.php (working copy)
@@ -43,7 +43,7 @@
$rs = exec_query($sql, $query, array($_SESSION['user_id']));
-if (!Config::get('ISPCP_SUPPORT_SYSTEM') || $rs->fields['support_system'] == 'no') {
+if (!Config::getInstance()->get('ISPCP_SUPPORT_SYSTEM') || $rs->fields['support_system'] == 'no') {
user_goto('index.php');
}
Index: gui/reseller/ticket_system.php
===================================================================
--- gui/reseller/ticket_system.php (revision 2801)
+++ gui/reseller/ticket_system.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('RESELLER_TEMPLATE_PATH') . '/ticket_system.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/ticket_system.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('tickets_list', 'page');
@@ -48,7 +48,7 @@
function gen_tickets_list(&$tpl, &$sql, $user_id) {
$start_index = 0;
- $rows_per_page = Config::get('DOMAIN_ROWS_PER_PAGE');
+ $rows_per_page = Config::getInstance()->get('DOMAIN_ROWS_PER_PAGE');
if (isset($_GET['psi'])) $start_index = $_GET['psi'];
@@ -219,11 +219,11 @@
$rs = exec_query($sql, $query, array($_SESSION['user_id']));
-if (!Config::get('ISPCP_SUPPORT_SYSTEM') || $rs->fields['support_system'] == 'no') {
+if (!Config::getInstance()->get('ISPCP_SUPPORT_SYSTEM') || $rs->fields['support_system'] == 'no') {
user_goto('index.php');
}
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -238,8 +238,8 @@
// static page messages.
-gen_reseller_mainmenu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/main_menu_ticket_system.tpl');
-gen_reseller_menu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/menu_ticket_system.tpl');
+gen_reseller_mainmenu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/main_menu_ticket_system.tpl');
+gen_reseller_menu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/menu_ticket_system.tpl');
gen_logged_from($tpl);
@@ -267,7 +267,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/reseller/ticket_view.php
===================================================================
--- gui/reseller/ticket_view.php (revision 2801)
+++ gui/reseller/ticket_view.php (working copy)
@@ -43,12 +43,12 @@
$rs = exec_query($sql, $query, array($_SESSION['user_id']));
-if (!Config::get('ISPCP_SUPPORT_SYSTEM') || $rs->fields['support_system'] == 'no') {
+if (!Config::getInstance()->get('ISPCP_SUPPORT_SYSTEM') || $rs->fields['support_system'] == 'no') {
user_goto('index.php');
}
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('RESELLER_TEMPLATE_PATH') . '/ticket_view.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/ticket_view.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('tickets_list', 'page');
@@ -94,7 +94,7 @@
}
get_ticket_from($tpl, $sql, $ticket_id);
- $date_formt = Config::get('DATE_FORMAT');
+ $date_formt = Config::getInstance()->get('DATE_FORMAT');
$ticket_content = wordwrap($rs->fields['ticket_message'], round(($screenwidth-200) / 7), "\n");
$tpl->assign(
@@ -143,7 +143,7 @@
$ticket_date = $rs->fields['ticket_date'];
$ticket_message = $rs->fields['ticket_message'];
- $date_formt = Config::get('DATE_FORMAT');
+ $date_formt = Config::getInstance()->get('DATE_FORMAT');
$ticket_content = wordwrap($ticket_message, round(($screenwidth-200) / 7), "\n");
$tpl->assign(
@@ -204,7 +204,7 @@
// common page data.
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -451,8 +451,8 @@
// static page messages.
-gen_reseller_mainmenu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/main_menu_ticket_system.tpl');
-gen_reseller_menu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/menu_ticket_system.tpl');
+gen_reseller_mainmenu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/main_menu_ticket_system.tpl');
+gen_reseller_menu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/menu_ticket_system.tpl');
gen_logged_from($tpl);
@@ -475,7 +475,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/reseller/user_add1.php
===================================================================
--- gui/reseller/user_add1.php (revision 2801)
+++ gui/reseller/user_add1.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('RESELLER_TEMPLATE_PATH') . '/user_add1.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/user_add1.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('add_user', 'page');
@@ -41,7 +41,7 @@
$tpl->define_dynamic('personalize', 'page');
$tpl->define_dynamic('alias_menu', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -58,8 +58,8 @@
*
*/
-gen_reseller_mainmenu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
-gen_reseller_menu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/menu_users_manage.tpl');
+gen_reseller_mainmenu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
+gen_reseller_menu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/menu_users_manage.tpl');
gen_logged_from($tpl);
@@ -103,7 +103,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
@@ -156,13 +156,13 @@
if (ispcp_domain_exists($dmn_name, $_SESSION['user_id'])) {
$even_txt = tr('Domain with that name already exists on the system!');
- } else if ($dmn_name == Config::get('BASE_SERVER_VHOST')) {
+ } else if ($dmn_name == Config::getInstance()->get('BASE_SERVER_VHOST')) {
$even_txt = tr('Master domain cannot be used!');
}
// we have plans only for admins
- if (Config::exists('HOSTING_PLANS_LEVEL')
- && Config::get('HOSTING_PLANS_LEVEL') === 'admin') {
+ if (Config::getInstance()->exists('HOSTING_PLANS_LEVEL')
+ && Config::getInstance()->get('HOSTING_PLANS_LEVEL') === 'admin') {
$dmn_pt = '_no_';
}
@@ -247,8 +247,8 @@
$sql = Database::getInstance();
- if (Config::exists('HOSTING_PLANS_LEVEL')
- && Config::get('HOSTING_PLANS_LEVEL') === 'admin') {
+ if (Config::getInstance()->exists('HOSTING_PLANS_LEVEL')
+ && Config::getInstance()->get('HOSTING_PLANS_LEVEL') === 'admin') {
$query = "
SELECT
t1.`id`,
Index: gui/reseller/user_add2.php
===================================================================
--- gui/reseller/user_add2.php (revision 2801)
+++ gui/reseller/user_add2.php (working copy)
@@ -33,17 +33,17 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('RESELLER_TEMPLATE_PATH') . '/user_add2.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/user_add2.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('alias_menu', 'page');
$tpl->define_dynamic('alias_add', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
// check if we have only hosting plans for admins - reseller should not edit them
-if (Config::exists('HOSTING_PLANS_LEVEL')
- && Config::get('HOSTING_PLANS_LEVEL') === 'admin') {
+if (Config::getInstance()->exists('HOSTING_PLANS_LEVEL')
+ && Config::getInstance()->get('HOSTING_PLANS_LEVEL') === 'admin') {
user_goto('users.php');
}
@@ -60,8 +60,8 @@
* static page messages.
*/
-gen_reseller_mainmenu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
-gen_reseller_menu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/menu_users_manage.tpl');
+gen_reseller_mainmenu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
+gen_reseller_menu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/menu_users_manage.tpl');
gen_logged_from($tpl);
@@ -130,7 +130,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
//unset_messages();
Index: gui/reseller/user_add3.php
===================================================================
--- gui/reseller/user_add3.php (revision 2801)
+++ gui/reseller/user_add3.php (working copy)
@@ -33,14 +33,14 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('RESELLER_TEMPLATE_PATH') . '/user_add3.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/user_add3.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('ip_entry', 'page');
$tpl->define_dynamic('alias_menu', 'page');
$tpl->define_dynamic('alias_add', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -56,8 +56,8 @@
* static page messages.
*
*/
-gen_reseller_mainmenu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
-gen_reseller_menu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/menu_users_manage.tpl');
+gen_reseller_mainmenu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
+gen_reseller_menu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/menu_users_manage.tpl');
gen_logged_from($tpl);
@@ -126,7 +126,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}// unset_messages();
@@ -271,8 +271,8 @@
unset($_SESSION["ch_hpprops"]);
} else {
- if (Config::exists('HOSTING_PLANS_LEVEL')
- && strtolower(Config::get('HOSTING_PLANS_LEVEL')) == 'admin') {
+ if (Config::getInstance()->exists('HOSTING_PLANS_LEVEL')
+ && strtolower(Config::getInstance()->get('HOSTING_PLANS_LEVEL')) == 'admin') {
$query = 'SELECT `props` FROM `hosting_plans` WHERE `id` = ?';
$res = exec_query($sql, $query, array($hpid));
} else {
@@ -360,7 +360,7 @@
$record_id = $sql->Insert_ID();
- $status = Config::get('ITEM_ADD_STATUS');
+ $status = Config::getInstance()->get('ITEM_ADD_STATUS');
$expire = $dmn_expire * 2635200; // months * 30.5 days
@@ -424,7 +424,7 @@
$user_id = $sql->Insert_ID();
- $awstats_auth = Config::get('AWSTATS_GROUP_AUTH');
+ $awstats_auth = Config::getInstance()->get('AWSTATS_GROUP_AUTH');
$query = "
INSERT INTO `htaccess_groups`
@@ -436,7 +436,7 @@
$rs = exec_query($sql, $query, array($dmn_id, $awstats_auth, $user_id, $status));
// Create the 3 default addresses if wanted
- if (Config::get('CREATE_DEFAULT_EMAIL_ADDRESSES'))
+ if (Config::getInstance()->get('CREATE_DEFAULT_EMAIL_ADDRESSES'))
{
client_mail_add_default_accounts($dmn_id, $user_email, $dmn_name); // 'domain', 0
}
Index: gui/reseller/user_add4.php
===================================================================
--- gui/reseller/user_add4.php (revision 2801)
+++ gui/reseller/user_add4.php (working copy)
@@ -33,14 +33,14 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('RESELLER_TEMPLATE_PATH') . '/user_add4.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/user_add4.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('alias_list', 'page');
$tpl->define_dynamic('alias_entry', 'alias_list');
$tpl->define_dynamic('alias_menu', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -86,8 +86,8 @@
$row = $result->FetchRow();
$dmn_status = $row['domain_status'];
- if($dmn_status != Config::get('ITEM_OK_STATUS') &&
- $dmn_status != Config::get('ITEM_ADD_STATUS')) {
+ if($dmn_status != Config::getInstance()->get('ITEM_OK_STATUS') &&
+ $dmn_status != Config::getInstance()->get('ITEM_ADD_STATUS')) {
set_page_message(tr('System error with Domain Id: %d', $domain_id));
@@ -111,8 +111,8 @@
gen_page_message($tpl);
-gen_reseller_mainmenu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
-gen_reseller_menu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/menu_users_manage.tpl');
+gen_reseller_mainmenu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
+gen_reseller_menu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/menu_users_manage.tpl');
gen_logged_from($tpl);
@@ -147,7 +147,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
// Begin function declaration lines
@@ -320,7 +320,7 @@
return;
}
// Begin add new alias domain
- $status = Config::get('ITEM_ADD_STATUS');
+ $status = Config::getInstance()->get('ITEM_ADD_STATUS');
$query = "INSERT INTO `domain_aliasses` (" .
"`domain_id`, `alias_name`, `alias_mount`, `alias_status`, " .
Index: gui/reseller/user_delete.php
===================================================================
--- gui/reseller/user_delete.php (revision 2801)
+++ gui/reseller/user_delete.php (working copy)
@@ -32,7 +32,7 @@
check_login(__FILE__);
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
if (isset($_GET['id'])) {
$usid = $_GET['id'];
Index: gui/reseller/user_edit.php
===================================================================
--- gui/reseller/user_edit.php (revision 2801)
+++ gui/reseller/user_edit.php (working copy)
@@ -42,12 +42,12 @@
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('RESELLER_TEMPLATE_PATH') . '/user_edit.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/user_edit.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('ip_entry', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -98,8 +98,8 @@
)
);
-gen_reseller_mainmenu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
-gen_reseller_menu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/menu_users_manage.tpl');
+gen_reseller_mainmenu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
+gen_reseller_menu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/menu_users_manage.tpl');
gen_logged_from($tpl);
@@ -158,7 +158,7 @@
gen_page_message($tpl);
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
//unset_messages();
@@ -342,10 +342,10 @@
// Change password
if (!chk_password($_POST['userpassword'])) {
- if (Config::get('PASSWD_STRONG')) {
- set_page_message(sprintf(tr('The password must be at least %s long and contain letters and numbers to be valid.'), Config::get('PASSWD_CHARS')));
+ if (Config::getInstance()->get('PASSWD_STRONG')) {
+ set_page_message(sprintf(tr('The password must be at least %s long and contain letters and numbers to be valid.'), Config::getInstance()->get('PASSWD_CHARS')));
} else {
- set_page_message(sprintf(tr('Password data is shorter than %s signs or includes not permitted signs!'), Config::get('PASSWD_CHARS')));
+ set_page_message(sprintf(tr('Password data is shorter than %s signs or includes not permitted signs!'), Config::getInstance()->get('PASSWD_CHARS')));
}
user_goto('user_edit.php?edit_id=' . $hpid);
}
Index: gui/reseller/user_statistics.php
===================================================================
--- gui/reseller/user_statistics.php (revision 2801)
+++ gui/reseller/user_statistics.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('RESELLER_TEMPLATE_PATH') . '/reseller_user_statistics.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/reseller_user_statistics.tpl');
$tpl->define_dynamic('page_message', 'page');
$tpl->define_dynamic('logged_from', 'page');
$tpl->define_dynamic('page_message', 'page');
@@ -48,7 +48,7 @@
$tpl->define_dynamic('scroll_next_gray', 'page');
$tpl->define_dynamic('scroll_next', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$rid = $_SESSION['user_id'];
$name = $_SESSION['user_logged'];
@@ -80,7 +80,7 @@
function generate_page(&$tpl, $reseller_id, $reseller_name) {
$sql = Database::getInstance();
- $rows_per_page = (int)(Config::get('DOMAIN_ROWS_PER_PAGE') / 2);
+ $rows_per_page = (int)(Config::getInstance()->get('DOMAIN_ROWS_PER_PAGE') / 2);
if (isset($_GET['psi'])) {
$start_index = (int)trim($_GET['psi']);
@@ -307,8 +307,8 @@
*
*/
-gen_reseller_mainmenu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/main_menu_statistics.tpl');
-gen_reseller_menu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/menu_statistics.tpl');
+gen_reseller_mainmenu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/main_menu_statistics.tpl');
+gen_reseller_menu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/menu_statistics.tpl');
gen_logged_from($tpl);
@@ -346,7 +346,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
Index: gui/reseller/users.php
===================================================================
--- gui/reseller/users.php (revision 2801)
+++ gui/reseller/users.php (working copy)
@@ -33,7 +33,7 @@
check_login(__FILE__);
$tpl = new pTemplate();
-$tpl->define_dynamic('page', Config::get('RESELLER_TEMPLATE_PATH') . '/users.tpl');
+$tpl->define_dynamic('page', Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/users.tpl');
$tpl->define_dynamic('users_list', 'page');
$tpl->define_dynamic('user_entry', 'users_list');
$tpl->define_dynamic('user_details', 'users_list');
@@ -46,7 +46,7 @@
$tpl->define_dynamic('edit_option', 'page');
$tpl->define_dynamic('alias_menu', 'page');
-$theme_color = Config::get('USER_INITIAL_THEME');
+$theme_color = Config::getInstance()->get('USER_INITIAL_THEME');
$tpl->assign(
array(
@@ -77,8 +77,8 @@
*
*/
-gen_reseller_mainmenu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
-gen_reseller_menu($tpl, Config::get('RESELLER_TEMPLATE_PATH') . '/menu_users_manage.tpl');
+gen_reseller_mainmenu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/main_menu_users_manage.tpl');
+gen_reseller_menu($tpl, Config::getInstance()->get('RESELLER_TEMPLATE_PATH') . '/menu_users_manage.tpl');
gen_logged_from($tpl);
@@ -112,7 +112,7 @@
)
);
-if (Config::exists('HOSTING_PLANS_LEVEL') && Config::get('HOSTING_PLANS_LEVEL') === 'admin') {
+if (Config::getInstance()->exists('HOSTING_PLANS_LEVEL') && Config::getInstance()->get('HOSTING_PLANS_LEVEL') === 'admin') {
$tpl->assign('EDIT_OPTION', '');
}
@@ -127,7 +127,7 @@
$tpl->parse('PAGE', 'page');
$tpl->prnt();
-if (Config::get('DUMP_GUI_DEBUG')) {
+if (Config::getInstance()->get('DUMP_GUI_DEBUG')) {
dump_gui_debug();
}
unset_messages();
@@ -140,7 +140,7 @@
$start_index = 0;
- $rows_per_page = Config::get('DOMAIN_ROWS_PER_PAGE');
+ $rows_per_page = Config::getInstance()->get('DOMAIN_ROWS_PER_PAGE');
if (isset($_POST['details']) && !empty($_POST['details'])) {
$_SESSION['details'] = $_POST['details'];
@@ -265,16 +265,16 @@
$i = 1;
while (!$rs->EOF) {
- if ($rs->fields['domain_status'] == Config::get('ITEM_OK_STATUS')) {
+ if ($rs->fields['domain_status'] == Config::getInstance()->get('ITEM_OK_STATUS')) {
$status_icon = "ok.png";
- } else if ($rs->fields['domain_status'] == Config::get('ITEM_DISABLED_STATUS')) {
+ } else if ($rs->fields['domain_status'] == Config::getInstance()->get('ITEM_DISABLED_STATUS')) {
$status_icon = "disabled.png";
- } else if ($rs->fields['domain_status'] == Config::get('ITEM_ADD_STATUS')
- || $rs->fields['domain_status'] == Config::get('ITEM_CHANGE_STATUS')
- || $rs->fields['domain_status'] == Config::get('ITEM_TOENABLE_STATUS')
- || $rs->fields['domain_status'] == Config::get('ITEM_RESTORE_STATUS')
- || $rs->fields['domain_status'] == Config::get('ITEM_TODISABLED_STATUS')
- || $rs->fields['domain_status'] == Config::get('ITEM_DELETE_STATUS')) {
+ } else if ($rs->fields['domain_status'] == Config::getInstance()->get('ITEM_ADD_STATUS')
+ || $rs->fields['domain_status'] == Config::getInstance()->get('ITEM_CHANGE_STATUS')
+ || $rs->fields['domain_status'] == Config::getInstance()->get('ITEM_TOENABLE_STATUS')
+ || $rs->fields['domain_status'] =;
+ $rows_per_page = Config::getInstance()->get('DOMAIN_ROWS_PER_PAGE');
if (isset($_POST['details']) && !empty($_POST['details'])) {
$_SESSION['details'] = $_POST['details'];
@@ -265,16 +265,16 @@
$i = 1;
while (!$rs->EOF) {
- if ($rs->fields['domain_status'] == Config::get('ITEM_OK_STATUS')) {
+ if ($rs->fields['domain_status'] == Config::getInstance()->get('ITEM_OK_STATUS')) {
$status_icon = "ok.png";
- } else if ($rs->fields['domain_status'] == Config::get('ITEM_DISABLED_STATUS')) {
+ } else if ($rs->fields['domain_status'] == Config::getInstance()->get('ITEM_DISABLED_STATUS')) {
$status_icon = "disabled.png";
- } else if ($rs->fields['domain_status'] == Config::get('ITEM_ADD_STATUS')
- || $rs->fields['domain_status'] == Config::get('ITEM_CHANGE_STATUS')
- || $rs->fields['domain_status'] == Config::get('ITEM_TOENABLE_STATUS')
- || $rs->fields['domain_status'] == Config::get('ITEM_RESTORE_STATUS')
- || $rs->fields['domain_status'] == Config::get('ITEM_TODISABLED_STATUS')
- || $rs->fields['domain_status'] == Config::get('ITEM_DELETE_STATUS')) {
+ } else if ($rs->fields['domain_status'] == Config::getInstance()->get('ITEM_ADD_STATUS')
+ || $rs->fields['domain_status'] == Config::getInstance()->get('ITEM_CHANGE_STATUS')
+ || $rs->fields['domain_status'] == Config::getInstance()->get('ITEM_TOENABLE_STATUS')
+ || $rs->fields['domain_status'] == Config::getInstance()->get('ITEM_RESTORE_STATUS')
+ || $rs->fields['domain_status'] == Config::getInstance()->get('ITEM_TODISABLED_STATUS')
+ || $rs->fields['domain_status'] == Config::getInstance()->get('ITEM_DELETE_STATUS')) {
$status_icon = "reload.png";
} else {
$status_icon = "error.png";
@@ -303,14 +303,14 @@
if ($dom_created == 0) {
$dom_created = tr('N/A');
} else {
- $date_formt = Config::get('DATE_FORMAT');
+ $date_formt = Config::getInstance()->get('DATE_FORMAT');
$dom_created = date($date_formt, $dom_created);
}
if ($dom_expires == 0) {
$dom_expires = tr('N/A');
} else {
- $date_formt = Config::get('DATE_FORMAT');
+ $date_formt = Config::getInstance()->get('DATE_FORMAT');
$dom_expires = date($date_formt, $dom_expires);
}