From 25907aff4dfaad777cec70b1f5159d742601c682 Mon Sep 17 00:00:00 2001 From: Florian Schaal Date: Sat, 14 Feb 2015 12:51:05 +0100 Subject: [PATCH] update resync-tool (translations, missing options, resync per server) --- interface/web/tools/form/resync.tform.php | 94 +-- interface/web/tools/lib/lang/ar_resync.lng | 52 +- interface/web/tools/lib/lang/bg_resync.lng | 60 +- interface/web/tools/lib/lang/br_resync.lng | 52 +- interface/web/tools/lib/lang/cz_resync.lng | 61 +- interface/web/tools/lib/lang/de_resync.lng | 51 +- interface/web/tools/lib/lang/el_resync.lng | 52 +- interface/web/tools/lib/lang/en_resync.lng | 52 +- interface/web/tools/lib/lang/es_resync.lng | 60 +- interface/web/tools/lib/lang/fi_resync.lng | 52 +- interface/web/tools/lib/lang/fr_resync.lng | 56 +- interface/web/tools/lib/lang/hr_resync.lng | 57 +- interface/web/tools/lib/lang/hu_resync.lng | 52 +- interface/web/tools/lib/lang/id_resync.lng | 52 +- interface/web/tools/lib/lang/it_resync.lng | 52 +- interface/web/tools/lib/lang/ja_resync.lng | 52 +- interface/web/tools/lib/lang/nl_resync.lng | 52 +- interface/web/tools/lib/lang/pl_resync.lng | 58 +- interface/web/tools/lib/lang/pt_resync.lng | 52 +- interface/web/tools/lib/lang/ro_resync.lng | 52 +- interface/web/tools/lib/lang/ru_resync.lng | 52 +- interface/web/tools/lib/lang/se_resync.lng | 52 +- interface/web/tools/lib/lang/sk_resync.lng | 52 +- interface/web/tools/lib/lang/tr_resync.lng | 52 +- .../web/tools/lib/menu.d/resync.menu.php | 3 +- interface/web/tools/resync.php | 546 ++++++++++++++++++ interface/web/tools/resync_do.php | 383 ------------ interface/web/tools/resync_show.php | 114 ---- interface/web/tools/templates/resync.htm | 254 ++++---- 29 files changed, 1565 insertions(+), 1064 deletions(-) create mode 100755 interface/web/tools/resync.php delete mode 100644 interface/web/tools/resync_do.php delete mode 100644 interface/web/tools/resync_show.php mode change 100644 => 100755 interface/web/tools/templates/resync.htm diff --git a/interface/web/tools/form/resync.tform.php b/interface/web/tools/form/resync.tform.php index 01c9470c4..3bc10a6c7 100644 --- a/interface/web/tools/form/resync.tform.php +++ b/interface/web/tools/form/resync.tform.php @@ -2,10 +2,10 @@ $form["title"] = "Resync Tool"; $form["description"] = ""; $form["name"] = "resync"; -$form["action"] = "resync_do.php"; +$form["action"] = "resync.php"; $form["db_history"] = "no"; $form["tab_default"] = "resync"; -$form["list_default"] = "resync_show.php"; +$form["list_default"] = "resync.php"; $form["auth"] = 'yes'; $form["auth_preset"]["userid"] = 0; // 0 = id of the user, > 0 id must match with id of current user @@ -18,96 +18,6 @@ $form["tabs"]['resync'] = array ( 'title' => "Resync", 'width' => 100, 'template' => "templates/resync.htm", - 'fields' => array ( - 'mail_server_id' => array ( - 'datatype' => 'INTEGER', - 'formtype' => 'SELECT', - 'default' => '', - 'datasource' => array ( 'type' => 'SQL', - 'querystring' => 'SELECT server_id FROM server WHERE mail_server = 1 AND mirror_server_id = 0 AND {AUTHSQL}', - 'keyfield'=> 'server_id', - 'valuefield'=> 'server_name' - ), - 'value' => '' - ), - 'web_server_id' => array ( - 'datatype' => 'INTEGER', - 'formtype' => 'SELECT', - 'default' => '', - 'datasource' => array ( 'type' => 'SQL', - 'querystring' => 'SELECT server_id FROM server WHERE web_server = 1 AND mirror_server_id = 0 AND {AUTHSQL}', - 'keyfield'=> 'server_id', - 'valuefield'=> 'server_name' - ), - 'value' => '' - ), - 'dns_server_id' => array ( - 'datatype' => 'INTEGER', - 'formtype' => 'SELECT', - 'default' => '', - 'datasource' => array ( 'type' => 'SQL', - 'querystring' => 'SELECT server_id FROM server WHERE dns_server = 1 AND mirror_server_id = 0 AND {AUTHSQL}', - 'keyfield'=> 'server_id', - 'valuefield'=> 'server_name' - ), - 'value' => '' - ), - 'file_server_id' => array ( - 'datatype' => 'INTEGER', - 'formtype' => 'SELECT', - 'default' => '', - 'datasource' => array ( 'type' => 'SQL', - 'querystring' => 'SELECT server_id FROM server WHERE file_server = 1 AND mirror_server_id = 0 AND {AUTHSQL}', - 'keyfield'=> 'server_id', - 'valuefield'=> 'server_name' - ), - 'value' => '' - ), - 'db_server_id' => array ( - 'datatype' => 'INTEGER', - 'formtype' => 'SELECT', - 'default' => '', - 'datasource' => array ( 'type' => 'SQL', - 'querystring' => 'SELECT server_id FROM server WHERE db_server = 1 AND mirror_server_id = 0 AND {AUTHSQL}', - 'keyfield'=> 'server_id', - 'valuefield'=> 'server_name' - ), - 'value' => '' - ), - 'vserver_server_id' => array ( - 'datatype' => 'INTEGER', - 'formtype' => 'SELECT', - 'default' => '', - 'datasource' => array ( 'type' => 'SQL', - 'querystring' => 'SELECT server_id FROM server WHERE vserver_server = 1 AND mirror_server_id = 0 AND {AUTHSQL}', - 'keyfield'=> 'server_id', - 'valuefield'=> 'server_name' - ), - 'value' => '' - ), - 'proxy_server_id' => array ( - 'datatype' => 'INTEGER', - 'formtype' => 'SELECT', - 'default' => '', - 'datasource' => array ( 'type' => 'SQL', - 'querystring' => 'SELECT server_id FROM server WHERE proxy_server = 1 AND mirror_server_id = 0 AND {AUTHSQL}', - 'keyfield'=> 'server_id', - 'valuefield'=> 'server_name' - ), - 'value' => '' - ), - 'firewall_server_id' => array ( - 'datatype' => 'INTEGER', - 'formtype' => 'SELECT', - 'default' => '', - 'datasource' => array ( 'type' => 'SQL', - 'querystring' => 'SELECT server_id FROM server WHERE firewall_server = 1 AND mirror_server_id = 0 AND {AUTHSQL}', - 'keyfield'=> 'server_id', - 'valuefield'=> 'server_name' - ), - 'value' => '' - ), - ) ); diff --git a/interface/web/tools/lib/lang/ar_resync.lng b/interface/web/tools/lib/lang/ar_resync.lng index 4e89bdead..97537c347 100644 --- a/interface/web/tools/lib/lang/ar_resync.lng +++ b/interface/web/tools/lib/lang/ar_resync.lng @@ -1,19 +1,45 @@ diff --git a/interface/web/tools/lib/lang/bg_resync.lng b/interface/web/tools/lib/lang/bg_resync.lng index 3a6a9db74..97537c347 100644 --- a/interface/web/tools/lib/lang/bg_resync.lng +++ b/interface/web/tools/lib/lang/bg_resync.lng @@ -1,19 +1,45 @@ diff --git a/interface/web/tools/lib/lang/br_resync.lng b/interface/web/tools/lib/lang/br_resync.lng index 4e89bdead..97537c347 100644 --- a/interface/web/tools/lib/lang/br_resync.lng +++ b/interface/web/tools/lib/lang/br_resync.lng @@ -1,19 +1,45 @@ diff --git a/interface/web/tools/lib/lang/cz_resync.lng b/interface/web/tools/lib/lang/cz_resync.lng index 56b937c3d..97537c347 100644 --- a/interface/web/tools/lib/lang/cz_resync.lng +++ b/interface/web/tools/lib/lang/cz_resync.lng @@ -1,20 +1,45 @@ - diff --git a/interface/web/tools/lib/lang/de_resync.lng b/interface/web/tools/lib/lang/de_resync.lng index 59d85b99b..32d1c23c1 100644 --- a/interface/web/tools/lib/lang/de_resync.lng +++ b/interface/web/tools/lib/lang/de_resync.lng @@ -1,20 +1,45 @@ diff --git a/interface/web/tools/lib/lang/el_resync.lng b/interface/web/tools/lib/lang/el_resync.lng index 4e89bdead..97537c347 100644 --- a/interface/web/tools/lib/lang/el_resync.lng +++ b/interface/web/tools/lib/lang/el_resync.lng @@ -1,19 +1,45 @@ diff --git a/interface/web/tools/lib/lang/en_resync.lng b/interface/web/tools/lib/lang/en_resync.lng index 4e89bdead..97537c347 100644 --- a/interface/web/tools/lib/lang/en_resync.lng +++ b/interface/web/tools/lib/lang/en_resync.lng @@ -1,19 +1,45 @@ diff --git a/interface/web/tools/lib/lang/es_resync.lng b/interface/web/tools/lib/lang/es_resync.lng index a699866cb..97537c347 100644 --- a/interface/web/tools/lib/lang/es_resync.lng +++ b/interface/web/tools/lib/lang/es_resync.lng @@ -1,19 +1,45 @@ diff --git a/interface/web/tools/lib/lang/fi_resync.lng b/interface/web/tools/lib/lang/fi_resync.lng index 4e89bdead..97537c347 100644 --- a/interface/web/tools/lib/lang/fi_resync.lng +++ b/interface/web/tools/lib/lang/fi_resync.lng @@ -1,19 +1,45 @@ diff --git a/interface/web/tools/lib/lang/fr_resync.lng b/interface/web/tools/lib/lang/fr_resync.lng index 81dd2252f..97537c347 100644 --- a/interface/web/tools/lib/lang/fr_resync.lng +++ b/interface/web/tools/lib/lang/fr_resync.lng @@ -1,15 +1,45 @@ diff --git a/interface/web/tools/lib/lang/hr_resync.lng b/interface/web/tools/lib/lang/hr_resync.lng index 8a97ae481..97537c347 100644 --- a/interface/web/tools/lib/lang/hr_resync.lng +++ b/interface/web/tools/lib/lang/hr_resync.lng @@ -1,16 +1,45 @@ - - diff --git a/interface/web/tools/lib/lang/hu_resync.lng b/interface/web/tools/lib/lang/hu_resync.lng index 4e89bdead..97537c347 100644 --- a/interface/web/tools/lib/lang/hu_resync.lng +++ b/interface/web/tools/lib/lang/hu_resync.lng @@ -1,19 +1,45 @@ diff --git a/interface/web/tools/lib/lang/id_resync.lng b/interface/web/tools/lib/lang/id_resync.lng index 4e89bdead..97537c347 100644 --- a/interface/web/tools/lib/lang/id_resync.lng +++ b/interface/web/tools/lib/lang/id_resync.lng @@ -1,19 +1,45 @@ diff --git a/interface/web/tools/lib/lang/it_resync.lng b/interface/web/tools/lib/lang/it_resync.lng index 4e89bdead..97537c347 100644 --- a/interface/web/tools/lib/lang/it_resync.lng +++ b/interface/web/tools/lib/lang/it_resync.lng @@ -1,19 +1,45 @@ diff --git a/interface/web/tools/lib/lang/ja_resync.lng b/interface/web/tools/lib/lang/ja_resync.lng index 4e89bdead..97537c347 100644 --- a/interface/web/tools/lib/lang/ja_resync.lng +++ b/interface/web/tools/lib/lang/ja_resync.lng @@ -1,19 +1,45 @@ diff --git a/interface/web/tools/lib/lang/nl_resync.lng b/interface/web/tools/lib/lang/nl_resync.lng index 4e89bdead..97537c347 100644 --- a/interface/web/tools/lib/lang/nl_resync.lng +++ b/interface/web/tools/lib/lang/nl_resync.lng @@ -1,19 +1,45 @@ diff --git a/interface/web/tools/lib/lang/pl_resync.lng b/interface/web/tools/lib/lang/pl_resync.lng index 77e656d46..97537c347 100644 --- a/interface/web/tools/lib/lang/pl_resync.lng +++ b/interface/web/tools/lib/lang/pl_resync.lng @@ -1,19 +1,45 @@ diff --git a/interface/web/tools/lib/lang/pt_resync.lng b/interface/web/tools/lib/lang/pt_resync.lng index 4e89bdead..97537c347 100644 --- a/interface/web/tools/lib/lang/pt_resync.lng +++ b/interface/web/tools/lib/lang/pt_resync.lng @@ -1,19 +1,45 @@ diff --git a/interface/web/tools/lib/lang/ro_resync.lng b/interface/web/tools/lib/lang/ro_resync.lng index 4e89bdead..97537c347 100644 --- a/interface/web/tools/lib/lang/ro_resync.lng +++ b/interface/web/tools/lib/lang/ro_resync.lng @@ -1,19 +1,45 @@ diff --git a/interface/web/tools/lib/lang/ru_resync.lng b/interface/web/tools/lib/lang/ru_resync.lng index 4e89bdead..97537c347 100644 --- a/interface/web/tools/lib/lang/ru_resync.lng +++ b/interface/web/tools/lib/lang/ru_resync.lng @@ -1,19 +1,45 @@ diff --git a/interface/web/tools/lib/lang/se_resync.lng b/interface/web/tools/lib/lang/se_resync.lng index 4e89bdead..97537c347 100644 --- a/interface/web/tools/lib/lang/se_resync.lng +++ b/interface/web/tools/lib/lang/se_resync.lng @@ -1,19 +1,45 @@ diff --git a/interface/web/tools/lib/lang/sk_resync.lng b/interface/web/tools/lib/lang/sk_resync.lng index 4e89bdead..97537c347 100644 --- a/interface/web/tools/lib/lang/sk_resync.lng +++ b/interface/web/tools/lib/lang/sk_resync.lng @@ -1,19 +1,45 @@ diff --git a/interface/web/tools/lib/lang/tr_resync.lng b/interface/web/tools/lib/lang/tr_resync.lng index 4e89bdead..97537c347 100644 --- a/interface/web/tools/lib/lang/tr_resync.lng +++ b/interface/web/tools/lib/lang/tr_resync.lng @@ -1,19 +1,45 @@ diff --git a/interface/web/tools/lib/menu.d/resync.menu.php b/interface/web/tools/lib/menu.d/resync.menu.php index bc25fff1a..65a331f46 100644 --- a/interface/web/tools/lib/menu.d/resync.menu.php +++ b/interface/web/tools/lib/menu.d/resync.menu.php @@ -9,8 +9,7 @@ if($app->auth->is_admin()) { $items[] = array( 'title' => 'Resync', 'target' => 'content', - 'link' => 'tools/resync_show.php'); - + 'link' => 'tools/resync.php'); $module['nav'][] = array( 'title' => 'Sync Tools', 'open' => 1, diff --git a/interface/web/tools/resync.php b/interface/web/tools/resync.php new file mode 100755 index 000000000..8e3b32f44 --- /dev/null +++ b/interface/web/tools/resync.php @@ -0,0 +1,546 @@ +auth->check_module_permissions('admin'); + +// Loading classes +$app->uses('tpl,tform,tform_actions'); +$app->load('tform_actions'); + +class page_action extends tform_actions { + + //* called during onShowEnd + private function create_list($server_rec, $server_type, $search) { + + $server_count = 0; + + //* we allow multiple search-pattern - convert string to array + if (!is_array($search)) { + $_search = $search; + $search=array(); + $search[]=$_search; + } + + foreach ($server_rec as $server) { + //* check the database for existing records + $server_data = $this->server_has_data($server_type, $server['server_id']); + foreach ($search as $needle) + if (in_array($needle, $server_data) && strpos($options_servers, $server['server_name']) === false) { + $options_servers .= ""; + $server_count++; + } + } + + return array($options_servers, $server_count); + } + + //* called from create_list + private function server_has_data($type, $server) { + + global $app; + + $server_id = $app->functions->intval($server); + + if($type == 'mail') { + $server_data = array ( + 'mail_domain' => array ( + 'index_field' => 'domain_id', + 'server_type' => 'mail', + ), + 'mail_mailinglist' => array ( + 'index_field' => 'mailinglist_id', + 'server_type' => 'mail', + ), + 'mail_user' => array ( + 'index_field' => 'mailuser_id', + 'server_type' => 'mail', + ), + ); + } + if($type == 'mail_filter') { + $server_data = array ( + 'mail_access' => array ( + 'index_field' => 'access_id', + 'server_type' => 'mail', + ), + 'mail_content_filter' => array ( + 'index_field' => 'content_filter_id', + 'server_type' => 'mail', + ), + 'mail_user_filter' => array ( + 'index_field' => 'filter_id', + 'server_type' => 'mail', + ), + ); + } + if($type == 'web' ) { + $server_data = array ( + 'web_domain' => array ( + 'index_field' => 'domain_id', + 'server_type' => 'web', + ), + 'shell_user' => array ( + 'index_field' => 'shell_user_id', + 'server_type' => 'web', + ), + 'cron' => array ( + 'index_field' => 'id', + 'server_type' => 'cron', + ), + 'ftp_user' => array ( + 'index_field' => 'ftp_user_id', + 'server_type' => 'web', + ), + ); + } + if($type == 'dns' ) { + $server_data = array ( + 'dns_soa' => array ( + 'index_field' => 'id', + 'server_type' => 'dns', + ), + ); + } + if($type == 'file' ) { + $server_data = array ( + 'webdav_user' => array ( + 'index_field' => 'webdav_user_id', + 'server_type' => 'file', + ), + ); + } + if($type == 'db' ) { + $server_data = array ( + 'web_database' => array ( + 'index_field' => 'web_database_id', + 'server_type' => 'db', + ), + ); + } + if($type == 'vserver' ) { + $server_data = array ( + 'openvz_vm' => array ( + 'index_field' => 'vm_id', + 'server_type' => 'vserver', + ), + ); + } + //* proxy + //* firewall + $array_out = array(); + foreach($server_data as $db_table => $data) { + $records = $app->db->queryAllRecords("SELECT * FROM $db_table WHERE server_id = ?", $server_id); + if (!empty($records)) array_push($array_out, $db_table); + } + + return $array_out; + } + + function onShowEnd() { + global $app; + + //* fetch all-server + $server_rec = $app->db->queryAllRecords("SELECT server_id, server_name FROM server WHERE active = 1 AND mirror_server_id = 0 ORDER BY active DESC, server_name"); + $server_count = 0; + foreach ($server_rec as $server) { + $options_servers .= ""; + $server_count++; + } + if ($server_count > 1) $options_servers = "" . $options_servers; + $app->tpl->setVar('all_server_id', $options_servers); + unset($options_servers); + + //* fetch mail-server + $mail_server_rec = $app->db->queryAllRecords("SELECT server_id, server_name FROM server WHERE mail_server = 1 AND active = 1 AND mirror_server_id = 0 ORDER BY active DESC, server_name"); + if (!empty($mail_server_rec)) { + $app->tpl->setVar('mail_server_found', 1); + + //* mail-domain + $server_list = $this->create_list($mail_server_rec, 'mail', 'mail_domain'); + $options_servers = $server_list[0];$server_count = $server_list[1]; + unset($server_list); + if (isset($options_servers)) { //* server with data found + if ($server_count > 1) $options_servers = "" . $options_servers; + $app->tpl->setVar('mail_server_id', $options_servers); + $app->tpl->setVar('mail_domain_found', 1); + unset($options_servers); + } + + //* mailbox + $server_list = $this->create_list($mail_server_rec, 'mail', 'mail_user'); + $options_servers = $server_list[0];$server_count = $server_list[1]; + unset($server_list); + if (isset($options_servers)) { //* server with data found + if ($server_count > 1) $options_servers = "" . $options_servers; + $app->tpl->setVar('mailbox_server_id', $options_servers); + $app->tpl->setVar('mail_user_found', 1); + unset($options_servers); + } + + //* mailfilter + $server_list = $this->create_list($mail_server_rec, 'mail_filter', array('mail_access', 'mail_content_filter', 'mail_user_filter')); + $options_servers = $server_list[0];$server_count = $server_list[1]; + unset($server_list); + if (isset($options_servers)) { //* server with data found + if ($server_count > 1) $options_servers = "" . $options_servers; + $app->tpl->setVar('mailfilter_server_id', $options_servers); + $app->tpl->setVar('mail_filter_found', 1); + unset($options_servers); + } + + //* mailinglist + $server_list = $this->create_list($mail_server_rec, 'mail', 'mail_mailinglist'); + $options_servers = $server_list[0];$server_count = $server_list[1]; + unset($server_list); + if (isset($options_servers)) { //* server with data found + if ($server_count > 1) $options_servers = "" . $options_servers; + $app->tpl->setVar('mailinglist_server_id', $options_servers); + $app->tpl->setVar('mailinglist_found', 1); + unset($options_servers); + } + } + + //* fetch web-server + $web_server_rec = $app->db->queryAllRecords("SELECT server_id, server_name FROM server WHERE web_server = 1 AND active = 1 AND mirror_server_id = 0 ORDER BY active DESC, server_name"); + if (!empty($web_server_rec)) { + $app->tpl->setVar('web_server_found', 1); + + //* web-domain + $server_list = $this->create_list($web_server_rec, 'web', 'web_domain'); + $options_servers = $server_list[0];$server_count = $server_list[1]; + unset($server_list); + if (isset($options_servers)) { //* server with data found + if ($server_count > 1) $options_servers = "" . $options_servers; + $app->tpl->setVar('web_server_id', $options_servers); + $app->tpl->setVar('web_domain_found', 1); + unset($options_servers); + } + + //* ftp-user + $server_list = $this->create_list($web_server_rec, 'web', 'ftp_user'); + $options_servers = $server_list[0];$server_count = $server_list[1]; + unset($server_list); + if (isset($options_servers)) { //* server with data found + if ($server_count > 1) $options_servers = "" . $options_servers; + $app->tpl->setVar('ftp_server_id', $options_servers); + $app->tpl->setVar('ftp_user_found', 1); + unset($options_servers); + } + + //* shell-user + $server_list = $this->create_list($web_server_rec, 'web', 'shell_user'); + $options_servers = $server_list[0];$server_count = $server_list[1]; + unset($server_list); + if (isset($options_servers)) { //* server with data found + if ($server_count > 1) $options_servers = "" . $options_servers; + $app->tpl->setVar('shell_server_id', $options_servers); + $app->tpl->setVar('shell_user_found', 1); + unset($options_servers); + } + + //* cron + $server_list = $this->create_list($web_server_rec, 'web', 'cron'); + $options_servers = $server_list[0];$server_count = $server_list[1]; + unset($server_list); + if (isset($options_servers)) { //* server with data found + if ($server_count > 1) $options_servers = "" . $options_servers; + $app->tpl->setVar('cron_server_id', $options_servers); + $app->tpl->setVar('cron_found', 1); + unset($options_servers); + } + } + + //* fetch dns-server + $dns_server_rec = $app->db->queryAllRecords("SELECT server_id, server_name FROM server WHERE dns_server = 1 AND active = 1 AND mirror_server_id = 0 ORDER BY active DESC, server_name"); + if (!empty($dns_server_rec)) { + $app->tpl->setVar('dns_server_found', 1); + + $server_list = $this->create_list($dns_server_rec, 'dns', 'dns_soa'); + $options_servers = $server_list[0];$server_count = $server_list[1]; + unset($server_list); + if (isset($options_servers)) { //* server with data found + if ($server_count > 1) $options_servers = "" . $options_servers; + $app->tpl->setVar('dns_server_id', $options_servers); + $app->tpl->setVar('dns_soa_found', 1); + unset($options_servers); + } + } + + //* fetch webdav-user + $file_server_rec = $app->db->queryAllRecords("SELECT server_id, server_name FROM server WHERE file_server = 1 AND active = 1 AND mirror_server_id = 0 ORDER BY active DESC, server_name"); + if (!empty($file_server_rec)) { + $app->tpl->setVar('file_server_found', 1); + + $server_list = $this->create_list($file_server_rec, 'file', 'webdav_user'); + $options_servers = $server_list[0];$server_count = $server_list[1]; + unset($server_list); + if (isset($options_servers)) { //* server with data found + if ($server_count > 1) $options_servers = "" . $options_servers; + $app->tpl->setVar('file_server_id', $options_servers); + $app->tpl->setVar('webdav_user_found', 1); + unset($options_servers); + } + } + + //* fetch database-server + $db_server_rec = $app->db->queryAllRecords("SELECT server_id, server_name FROM server WHERE db_server = 1 AND active = 1 AND mirror_server_id = 0 ORDER BY active DESC, server_name"); + if (!empty($db_server_rec)) { + $app->tpl->setVar('db_server_found', 1); + + $server_list = $this->create_list($db_server_rec, 'db', 'web_database'); + $options_servers = $server_list[0];$server_count = $server_list[1]; + unset($server_list); + if (isset($options_servers)) { //* server with data found + if ($server_count > 1) $options_servers = "" . $options_servers; + $app->tpl->setVar('db_server_id', $options_servers); + $app->tpl->setVar('client_db_found', 1); + unset($options_servers); + } + } + + //* fetch vserver + $v_server_rec = $app->db->queryAllRecords("SELECT server_id, server_name FROM server WHERE vserver_server = 1 AND active = 1 AND mirror_server_id = 0 ORDER BY active DESC, server_name"); + if (!empty($db_server_rec)) { + $app->tpl->setVar('vserver_server_found', 1); + + $server_list = $this->create_list($v_server_rec, 'vserver', 'openvz_vm'); + $options_servers = $server_list[0];$server_count = $server_list[1]; + unset($server_list); + if (isset($options_servers)) { //* server with data found + if ($server_count > 1) $options_servers = "" . $options_servers; + $app->tpl->setVar('vserver_server_id', $options_servers); + $app->tpl->setVar('vserver_found', 1); + unset($options_servers); + } + } + + parent::onShowEnd(); + } + + //* fetch values during do_resync + private function query_server($db_table, $server_id, $server_type, $active=true) { + global $app; + + $server_name = array(); + if ( $server_id == 0 ) { //* resync multiple server + $temp = $app->db->queryAllRecords("SELECT server_id, server_name FROM server WHERE ".$server_type."_server = 1 AND active = 1 AND mirror_server_id = 0"); + foreach ($temp as $server) { + $temp_id .= $server['server_id'].','; + $server_name[$server['server_id']] = $server['server_name']; + } + } else { + $temp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = ?", $server_id); + $server_name[$server_id] = $temp['server_name']; + } + unset($temp); + + if ( isset($temp_id) ) $server_id = rtrim($temp_id,','); + $sql = "SELECT * FROM $db_table WHERE server_id IN (".$server_id.")"; + if ($active) $sql .= " AND active = 'y'"; + $records = $app->db->queryAllRecords($sql); + + return array($records, $server_name); + } + + private function do_resync($db_table, $index_field, $server_type, $server_id, $msg_field, $wordbook, $active=true) { + global $app; + + $server_id = $app->functions->intval($server_id); + $rec = $this->query_server($db_table, $server_id, $server_type, $active); + $records = $rec[0]; + $server_name = $rec[1]; + $msg = ''.$wordbook.'
'; + if(!empty($records)) + foreach($records as $rec) { + $app->db->datalogUpdate($db_table, $rec, $index_field, $rec[$index_field], true); + $msg .= '['.$server_name[$rec['server_id']].'] '.$rec[$msg_field].'
'; + } + else $msg .= $app->tform->wordbook['no_results_txt'].'
'; + + return $msg.'
'; + } + + function onSubmit() { + global $app; + + //* all services + if($this->dataRecord['resync_all'] == 1) { + $this->dataRecord['resync_sites'] = 1; + $this->dataRecord['resync_ftp'] = 1; + $this->dataRecord['resync_webdav'] = 1; + $this->dataRecord['resync_shell'] = 1; + $this->dataRecord['resync_cron'] = 1; + $this->dataRecord['resync_db'] = 1; + $this->dataRecord['resync_mail'] = 1; + $this->dataRecord['resync_mailbox'] = 1; + $this->dataRecord['resync_mailfilter'] = 1; + $this->dataRecord['resync_mailinglist'] = 1; + $this->dataRecord['resync_vserver'] = 1; + $this->dataRecord['resync_dns'] = 1; + $this->dataRecord['resync_client'] = 1; + $this->dataRecord['web_server_id'] = $this->dataRecord['all_server_id']; + $this->dataRecord['ftp_server_id'] = $this->dataRecord['all_server_id']; + $this->dataRecord['webdav_server_id'] = $this->dataRecord['all_server_id']; + $this->dataRecord['shell_server_id'] = $this->dataRecord['all_server_id']; + $this->dataRecord['cron_server_id'] = $this->dataRecord['all_server_id']; + $this->dataRecord['db_server_id'] = $this->dataRecord['all_server_id']; + $this->dataRecord['mail_server_id'] = $this->dataRecord['all_server_id']; + $this->dataRecord['mailbox_server_id'] = $this->dataRecord['all_server_id']; + $this->dataRecord['verserver_server_id'] = $this->dataRecord['all_server_id']; + $this->dataRecord['dns_server_id'] = $this->dataRecord['all_server_id']; + } + + //* websites + if($this->dataRecord['resync_sites'] == 1) + $msg .= $this->do_resync('web_domain', 'domain_id', 'web', $this->dataRecord['web_server_id'], 'domain', $app->tform->wordbook['do_sites_txt']); + + //* ftp + if($this->dataRecord['resync_ftp'] == 1) + $msg .= $this->do_resync('ftp_user', 'ftp_user_id', 'web', $this->dataRecord['ftp_server_id'], 'username', $app->tform->wordbook['do_ftp_txt']); + + //* webdav + if($this->dataRecord['resync_webdav'] == 1) + $msg .= $this->do_resync('webdav_user', 'webdav_user_id', 'file', $this->dataRecord['webdav_server_id'], 'username', $app->tform->wordbook['do_webdav_txt']); + + //* shell + if($this->dataRecord['resync_shell'] == 1) + $msg .= $this->do_resync('shell_user', 'shell_user_id', 'web', $this->dataRecord['shell_server_id'], 'username', $app->tform->wordbook['do_shell_txt']); + + //* cron + if($this->dataRecord['resync_cron'] == 1) + $msg .= $this->do_resync('cron', 'id', 'web', $this->dataRecord['cron_server_id'], 'command', $app->tform->wordbook['do_cron_txt']); + + //* database + if(isset($this->dataRecord['resync_db']) && $this->dataRecord['resync_db'] == 1) { + $msg .= $this->do_resync('web_database_user', 'database_user_id', 'db', $this->dataRecord['db_server_id'], 'database_user', $app->tform->wordbook['do_db_user_txt']); + $msg .= $this->do_resync('web_database', 'database_id', 'db', $this->dataRecord['db_server_id'], 'database_name', $app->tform->wordbook['do_db_txt']); + } + + //* maildomains + if($this->dataRecord['resync_mail'] == 1) + $msg .= $this->do_resync('mail_domain', 'domain_id', 'mail', $this->dataRecord['mail_server_id'], 'domain', $app->tform->wordbook['do_mail_txt']); + + //* mailbox + if($this->dataRecord['resync_mailbox'] == 1) { + $msg .= $this->do_resync('mail_user', 'mailuser_id', 'mail', $this->dataRecord['mailbox_server_id'], 'email', $app->tform->wordbook['do_mailbox_txt'], false); + $msg .= $this->do_resync('mail_forwarding', 'forwarding_id', 'mail', $this->dataRecord['mailbox_server_id'], '', $app->tform->wordbook['do_mail_alias_txt']); + } + + //* mailfilter + if($this->dataRecord['resync_mailfilter'] == 1) { + $msg .= $this->do_resync('mail_access', 'access_id', 'mail', $this->dataRecord['mailbox_server_id'], '', $app->tform->wordbook['do_mail_access_txt']); + $msg .= $this->do_resync('mail_content_filter', 'content_filter_id', 'mail', $this->dataRecord['mailbox_server_id'], '', $app->tform->wordbook['do_mail_contentfilter_txt']); + $msg .= $this->do_resync('mail_user_filter', 'filter_id', 'mail', $this->dataRecord['mailbox_server_id'], '', $app->tform->wordbook['do_mail_userfilter_txt'], false); + } + + //* mailinglists + if($this->dataRecord['resync_mailinglist'] == 1) + $msg .= $this->do_resync('mail_mailinglist', 'mailinglist_id', 'mail', $this->dataRecord['mail_server_id'], 'listname', $app->tform->wordbook['do_mailinglist_txt'], false); + + //* vserver + if($this->dataRecord['resync_vserver'] == 1) + $msg .= $this->do_resync('openvz_vm', 'vm_id', 'vserver', $this->dataRecord['verserver_server_id'], 'hostname', $app->tform->wordbook['do_vserver_txt']); + + //* dns + if($this->dataRecord['resync_dns'] == 1) { + $rec=$this->query_server('dns_soa', $this->dataRecord['dns_server_id'], 'dns'); + $soa_records = $rec[0]; + $server_name = $rec[1]; + unset($rec); + $msg .= ''.$app->tform->wordbook['do_dns_txt'].'
'; + if(is_array($soa_records) && !empty($soa_records)) + foreach($soa_records as $soa_rec) { + $temp = $this->query_server('dns_rr', $soa_rec['server_id'], $server_type); + $rr_records = $temp[0]; + if(!empty($rr_records)) { + foreach($rr_records as $rec) { + $new_serial = $app->validate_dns->increase_serial($rec['serial']); + $app->db->datalogUpdate('dns_rr', "serial = '".$new_serial."'", 'id', $rec['id']); + } + } else { + $msg .= $app->tform->wordbook['no_results_txt'].'
'; + } + $new_serial = $app->validate_dns->increase_serial($soa_rec['serial']); + $app->db->datalogUpdate('dns_soa', "serial = '".$new_serial."'", 'id', $soa_rec['id']); + $msg .= '['.$server_name[$soa_rec['server_id']].'] '.$soa_rec['origin'].'
'; + } + else $msg .= $app->tform->wordbook['no_results_txt'].'
'; + + $msg .= '
'; + } + + //* clients + if($this->dataRecord['resync_client'] == 1) { + $db_table = 'client'; + $index_field = 'client_id'; + $records = $app->db->queryAllRecords("SELECT * FROM ".$db_table); + $msg .= ''.$app->tform->wordbook['do_clients_txt'].'
'; + if(!empty($records)) { + $tform_def_file = '../client/form/client.tform.php'; + $app->uses('tpl,tform,tform_actions'); + $app->load('tform_actions'); + foreach($records as $rec) { + $app->db->datalogUpdate($db_table, $rec, $index_field, $rec[$index_field], true); + $tmp = new tform_actions; + $tmp->id = $rec[$index_field]; + $tmp->dataRecord = $rec; + $tmp->oldDataRecord = $rec; + $app->plugin->raiseEvent('client:client:on_after_update', $tmp); + $msg .= $rec['contact_name'].'
'; + unset($tmp); + } + } else { + $msg .= $app->tform->wordbook['no_results_txt'].'
'; + } + $msg .= '
'; + } + + echo $msg; + } //* end onSumbmit + +} + +$page = new page_action; +$page->onLoad(); +?> diff --git a/interface/web/tools/resync_do.php b/interface/web/tools/resync_do.php deleted file mode 100644 index 08157376f..000000000 --- a/interface/web/tools/resync_do.php +++ /dev/null @@ -1,383 +0,0 @@ -auth->check_module_permissions('admin'); - -// Loading classes -$app->uses('tpl,tform,tform_actions'); -$app->load('tform_actions'); - -class page_action extends tform_actions { - - function onSubmit() { - global $app, $conf, $interfaceConf; - - function query_server($table, $server_id, $server_type, $where = "WHERE active = 'y'", $active_only = true) { - global $app; - $server_name = array(); - if ( $server_id <= 0 ) { //* resync multiple server - if ($active_only) { - $tmp = $app->db->queryAllRecords("SELECT server_id, server_name FROM server WHERE ".$server_type."_server = 1 AND active = 1 AND mirror_server_id = 0"); - } else { - $tmp = $app->db->queryAllRecords("SELECT server_id, server_name FROM server WHERE ".$server_type."_server = 1 AND mirror_server_id = 0"); - } - foreach ($tmp as $server) { - $tmp_id .= $server['server_id'].','; - $server_name[$server['server_id']] = $server['server_name']; - } - } else { - $temp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = ".$server_id); - $server_name[$server_id] = $temp['server_name']; - unset($temp); - } - - if ( isset($tmp_id) ) $server_id = rtrim($tmp_id,','); - - if ($active_only) { - $sql = "SELECT * FROM ".$table." ".$where." AND server_id IN (".$server_id.")"; - } else { - $sql = "SELECT * FROM ".$table." ".$where; - } - $records = $app->db->queryAllRecords($sql); - - return array($records, $server_name); - } - - //* websites - if(isset($this->dataRecord['resync_sites']) && $this->dataRecord['resync_sites'] == 1) { - $db_table = 'web_domain'; - $index_field = 'domain_id'; - $server_type = 'web'; - $server_id = $app->functions->intval($this->dataRecord['web_server_id']); - if ($server_id == -1) $tmp = query_server($db_table, $server_id, $server_type, 'WHERE 1', false); else $tmp = query_server($db_table, $server_id, $server_type); - $records = $tmp[0]; - $server_name = $tmp[1]; - unset($tmp); - $msg = 'Resynced Website:
'; - if(is_array($records)) { - foreach($records as $rec) { - $app->db->datalogUpdate($db_table, $rec, $index_field, $rec[$index_field], true); - $msg .= $rec['domain'].' on '.$server_name[$rec['server_id']].'
'; - } - } else { $msg .= 'no results'; } - $msg .= '
'; - } - - //* ftp - if(isset($this->dataRecord['resync_ftp']) && $this->dataRecord['resync_ftp'] == 1) { - $db_table = 'ftp_user'; - $index_field = 'ftp_user_id'; - $server_type = 'web'; - $server_id = $app->functions->intval($this->dataRecord['ftp_server_id']); - if ($server_id == -1) $tmp = query_server($db_table, $server_id, $server_type, 'WHERE 1', false); else $tmp = query_server($db_table, $server_id, $server_type); - $records = $tmp[0]; - $server_name = $tmp[1]; - unset($tmp); - $msg .= 'Resynced FTP user:
'; - if(is_array($records)) { - foreach($records as $rec) { - $app->db->datalogUpdate($db_table, $rec, $index_field, $rec[$index_field], true); - $msg .= $rec['username'].' on '.$server_name[$rec['server_id']].'
'; - } - } else { $msg .= 'no results'; } - $msg .= '
'; - } - - //* webdav - if(isset($this->dataRecord['resync_webdav']) && $this->dataRecord['resync_webdav'] == 1) { - $db_table = 'webdav_user'; - $index_field = 'webdav_user_id'; - $server_type = 'file'; - $server_id = $app->functions->intval($this->dataRecord['webdav_server_id']); - if ($server_id == -1) $tmp = query_server($db_table, $server_id, $server_type, 'WHERE 1', false); else $tmp = query_server($db_table, $server_id, $server_type); - $records = $tmp[0]; - $server_name = $tmp[1]; - unset($tmp); - $msg .= 'Resynced WebDav-User
'; - if(is_array($records)) { - foreach($records as $rec) { - $app->db->datalogUpdate($db_table, $rec, $index_field, $rec[$index_field], true); - $msg .= $rec['username'].' on '.$server_name[$rec['server_id']].'
'; - } - } else { $msg .= 'no results'; } - $msg .= '
'; - } - - //* shell - if(isset($this->dataRecord['resync_shell']) && $this->dataRecord['resync_shell'] == 1) { - $db_table = 'shell_user'; - $index_field = 'shell_user_id'; - $server_type = 'web'; - $server_id = $app->functions->intval($this->dataRecord['shell_server_id']); - if ($server_id == -1) $tmp = query_server($db_table, $server_id, $server_type, 'WHERE 1', false); else $tmp = query_server($db_table, $server_id, $server_type); - $records = $tmp[0]; - $server_name = $tmp[1]; - unset($tmp); - $msg .= 'Resynced Shell user:
'; - if(is_array($records)) { - foreach($records as $rec) { - $app->db->datalogUpdate($db_table, $rec, $index_field, $rec[$index_field], true); - $msg .= $rec['username'].' on '.$server_name[$rec['server_id']].'
'; - } - } else { $msg .= 'no results'; } - $msg .= '
'; - } - - //* cron - if(isset($this->dataRecord['resync_cron']) && $this->dataRecord['resync_cron'] == 1) { - $db_table = 'cron'; - $index_field = 'id'; - $server_type = 'web'; - $server_id = $app->functions->intval($this->dataRecord['cron_server_id']); - if ($server_id == -1) $tmp = query_server($db_table, $server_id, $server_type, 'WHERE 1', false); else $tmp = query_server($db_table, $server_id, $server_type); - $records = $tmp[0]; - $server_name = $tmp[1]; - unset($tmp); - $msg .= 'Resynced Cronjob:
'; - if(is_array($records)) { - foreach($records as $rec) { - $app->db->datalogUpdate($db_table, $rec, $index_field, $rec[$index_field], true); - $msg .= $rec['command'].' on '.$server_name[$rec['server_id']].'
'; - } - } else { $msg .= 'no results'; } - $msg .= '
'; - } - - //* database - if(isset($this->dataRecord['resync_db']) && $this->dataRecord['resync_db'] == 1) { - $db_table = 'web_database_user'; - $index_field = 'database_user_id'; - $server_type = 'db'; - $server_id = $app->functions->intval($this->dataRecord['db_server_id']); - if ($server_id == -1) $tmp = query_server($db_table, $server_id, $server_type, 'WHERE 1', false); else $tmp = query_server($db_table, $server_id, $server_type, 'WHERE 1'); - $records = $tmp[0]; - $server_name = $tmp[1]; - unset($tmp); - $msg .= 'Resynced Database User:
'; - if(is_array($records)) { - foreach($records as $rec) { - $app->db->datalogUpdate($db_table, $rec, $index_field, $rec[$index_field], true); - $msg .= $rec['database_user'].' on '.$server_name[$rec['server_id']].'
'; - } - } else { $msg .= 'no results'; } - $msg .= '
'; - - $db_table = 'web_database'; - $index_field = 'database_id'; - if ($server_id == -1) $tmp = query_server($db_table, $server_id, $server_type, 'WHERE 1', false); else $tmp = query_server($db_table, $server_id, $server_type); - $records = $tmp[0]; - $msg .= 'Resynced Database:
'; - if(is_array($records)) { - foreach($records as $rec) { - $app->db->datalogUpdate($db_table, $rec, $index_field, $rec[$index_field], true); - $msg .= $rec['database_name'].' on '.$server_name[$rec['server_id']].'
'; - } - } else { $msg .= 'no results'; } - $msg .= '
'; - - } - - //* maildomains - if(isset($this->dataRecord['resync_mail']) && $this->dataRecord['resync_mail'] == 1) { - $db_table = 'mail_domain'; - $index_field = 'domain_id'; - $server_type = 'mail'; - $server_id = $app->functions->intval($this->dataRecord['mail_server_id']); - if ($server_id == -1) $tmp = query_server($db_table, $server_id, $server_type, 'WHERE 1', false); else $tmp = query_server($db_table, $server_id, $server_type); - $records = $tmp[0]; - $server_name = $tmp[1]; - unset($tmp); - $msg .= 'Resynced Maildomain:
'; - if(is_array($records)) { - foreach($records as $rec) { - $app->db->datalogUpdate($db_table, $rec, $index_field, $rec[$index_field], true); - $msg .= $rec['domain'].' on '.$server_name[$rec['server_id']].'
'; - } - } else { $msg .= 'no results'; } - $msg .= '
'; - } - - //* mailbox - if(isset($this->dataRecord['resync_mailbox']) && $this->dataRecord['resync_mailbox'] == 1) { - $db_table = 'mail_user'; - $index_field = 'mailuser_id'; - $server_type = 'mail'; - $server_id = $app->functions->intval($this->dataRecord['mailbox_server_id']); - if ($server_id == -1) $tmp = query_server($db_table, $server_id, $server_type, 'WHERE 1', false); else $tmp = query_server($db_table, $server_id, $server_type, 'WHERE 1'); - $records = $tmp[0]; - $server_name = $tmp[1]; - unset($tmp); - $msg .= 'Resynced Mailbox:
'; - if(is_array($records)) { - foreach($records as $rec) { - $app->db->datalogUpdate($db_table, $rec, $index_field, $rec[$index_field], true); - $msg .= $rec['email'].' on '.$server_name[$rec['server_id']].'
'; - } - } else { $msg .= 'no results'; } - $msg .= '
'; - - $db_table = 'mail_forwarding'; - $index_field = 'forwarding_id'; - if ($server_id == -1) $tmp = query_server($db_table, $server_id, $server_type, 'WHERE 1', false); else $tmp = query_server($db_table, $server_id, $server_type); - $records = $tmp[0]; - $server_name = $tmp[1]; - unset($tmp); - $msg .= 'Resynced Alias
'; - if(is_array($records)) { - foreach($records as $rec) { - $app->db->datalogUpdate($db_table, $rec, $index_field, $rec[$index_field], true); - } - } else { $msg .= 'no results'; } - $msg .= '
'; - } - - //* dns - if(isset($this->dataRecord['resync_dns']) && $this->dataRecord['resync_dns'] == 1) { - $db_table = 'dns_soa'; - $index_field = 'id'; - $server_type = 'dns'; - $server_id = $app->functions->intval($this->dataRecord['dns_server_id']); - if ($server_id == -1) $tmp = query_server($db_table, $server_id, $server_type, 'WHERE 1', false); else $tmp = query_server($db_table, $server_id, $server_type, "WHERE active = 'Y'"); - $zone_records = $tmp[0]; - $server_name = $tmp[1]; - unset($tmp); - $msg .= 'Resynced DNS zone
'; - if(is_array($zone_records) && !empty($zone_records)) { - foreach($zone_records as $zone_rec) { - if ($server_id == -1) { - $temp = query_server('dns_rr', $server_id, $server_type, 'WHERE 1', false); - $records = $temp[0]; - unset($temp); - } else { - $temp= query_server('dns_rr', $server_id, $server_type, "WHERE active = 'Y'"); - $records = $temp[0]; - unset($temp); - } - $rr_count = 0; - if (is_array($records)) { - foreach($records as $rec) { - $new_serial = $app->validate_dns->increase_serial($rec['serial']); - $app->db->datalogUpdate('dns_rr', "serial = '".$new_serial."'", 'id', $rec['id']); - $rr_count++; - } - } else { $msg .= 'no dns recordsesults
'; } - $new_serial = $app->validate_dns->increase_serial($zone_rec['serial']); - $app->db->datalogUpdate('dns_soa', "serial = '".$new_serial."'", 'id', $zone_rec['id']); - $msg .= $zone_rec['origin'].' on '.$server_name[$zone_rec['server_id']].' with '.$rr_count.' records
'; - } - } else { $msg .= 'no results
'; } - $msg .= '
'; - } - - //* clients - if(isset($this->dataRecord['resync_client']) && $this->dataRecord['resync_client'] == 1) { - $db_table = 'client'; - $index_field = 'client_id'; - $records = $app->db->queryAllRecords("SELECT * FROM ".$db_table); - $msg .= 'Resynced clients
'; - if(is_array($records)) { - $tform_def_file = '../client/form/client.tform.php'; - $app->uses('tpl,tform,tform_actions'); - $app->load('tform_actions'); - foreach($records as $rec) { - $app->db->datalogUpdate($db_table, $rec, $index_field, $rec[$index_field], true); - $tmp = new tform_actions; - $tmp->id = $rec[$index_field]; - $tmp->dataRecord = $rec; - $tmp->oldDataRecord = $rec; - $app->plugin->raiseEvent('client:client:on_after_update', $tmp); - $msg .= $rec['contact_name'].'
'; - unset($tmp); - } - } else { $msg .= 'no results'; } - $msg .= '
'; - } - - //* vserver - if(isset($this->dataRecord['resync_vserver']) && $this->dataRecord['resync_vserver'] == 1) { - $db_table = 'openvz_vm'; - $index_field = 'vm_id'; - $server_type = 'vserver'; - $server_id = $app->functions->intval($this->dataRecord['vserver_server_id']); - if ($server_id == -1) $tmp = query_server($db_table, $server_id, $server_type, 'WHERE 1', false); else $tmp = query_server($db_table, $server_id, $server_type); - $records = $tmp[0]; - $server_name = $tmp[1]; - unset($tmp); - $msg .= 'Resynced vServer:
'; - if(is_array($records)) { - foreach($records as $rec) { - $app->db->datalogUpdate($db_table, $rec, $index_field, $rec[$index_field], true); - $msg .= $rec['hostname'].' on '.$server_name[$rec['server_id']].'
'; - } - } else { $msg .= 'no results'; } - $msg .= '
'; - } - - //* firewall - if(isset($this->dataRecord['resync_firewall']) && $this->dataRecord['resync_firewall'] == 1) { - $db_table = 'iptables'; - $index_field = 'iptables_id'; - $server_type = 'firewall'; - $server_id = $app->functions->intval($this->dataRecord['firewall_server_id']); - if ($server_id == -1) $tmp = query_server($db_table, $server_id, $server_type, 'WHERE 1', false); else $tmp = query_server($db_table, $server_id, $server_type); - $records = $tmp[0]; - $server_name = $tmp[1]; - unset($tmp); - $msg .= 'Resynced Firewall
'; - if(is_array($records)) { - foreach($records as $rec) { - $app->db->datalogUpdate($db_table, $rec, $index_field, $rec[$index_field], true); - } - } else { $msg .= 'no results'; } - $msg .= '
'; - } - - echo $msg; - } - -} - -$page = new page_action; -$page->onLoad(); -?> diff --git a/interface/web/tools/resync_show.php b/interface/web/tools/resync_show.php deleted file mode 100644 index b74515d65..000000000 --- a/interface/web/tools/resync_show.php +++ /dev/null @@ -1,114 +0,0 @@ -auth->check_module_permissions('admin'); - -// Loading classes -$app->uses('tpl,tform,tform_actions'); -$app->load('tform_actions'); - -class page_action extends tform_actions { - - function get_servers($type) { - global $app; - - $inactive_server = false; - $tmp = $app->db->queryAllRecords("SELECT server_id, server_name, active FROM server WHERE ".$type."_server = 1 AND mirror_server_id = 0 ORDER BY active DESC, server_name"); - foreach ($tmp as $server) { - if ( $server['active'] == '0' ) { - $server['server_name'] .= ' [inactive]'; - $inactive_server = true; - } - $options_servers .= ""; - } - if ( count ($tmp) > 1 ) { - $options_servers = "" . $options_servers; - if ($inactive_server) $options_servers .= ""; - } - - return $options_servers; - - } - - function onShowEnd() { - global $app, $conf; - - $servers = $this->get_servers('mail'); - $app->tpl->setVar('mail_server_id', $servers); - if ( !empty($servers) ) $app->tpl->setVar('mail_server_found', 1); - - $servers = $this->get_servers('web'); - $app->tpl->setVar('web_server_id', $servers); - $app->tpl->setVar('ftp_server_id', $servers); - if ( !empty($servers) ) $app->tpl->setVar('web_server_found', 1); - - $servers = $this->get_servers('dns'); - $app->tpl->setVar('dns_server_id', $servers); - if ( !empty($servers) ) $app->tpl->setVar('dns_server_found', 1); - - $servers = $this->get_servers('file'); - $app->tpl->setVar('file_server_id', $servers); - if ( !empty($servers) ) $app->tpl->setVar('file_server_found', 1); - - $servers = $this->get_servers('db'); - $app->tpl->setVar('db_server_id', $servers); - if ( !empty($servers) ) $app->tpl->setVar('db_server_found', 1); - - $servers = $this->get_servers('vserver'); - $app->tpl->setVar('vserver_server_id', $servers); - if ( !empty($servers) ) $app->tpl->setVar('vserver_server_found', 1); - - $servers = $this->get_servers('firewall'); - $app->tpl->setVar('firewall_server_id', $servers); - if ( !empty($servers) ) $app->tpl->setVar('firewall_server_found', 1); - - parent::onShowEnd(); - } - -} - -$page = new page_action; -$page->onLoad(); - -?> diff --git a/interface/web/tools/templates/resync.htm b/interface/web/tools/templates/resync.htm old mode 100644 new mode 100755 index 8b6769e62..48e20cc85 --- a/interface/web/tools/templates/resync.htm +++ b/interface/web/tools/templates/resync.htm @@ -2,193 +2,133 @@

- - +
+
+ +
+
+ + +
- -
-
- - - - {tmpl_var name="resync_no_server_txt"} - - +
+ +
- - - + +
- -
-
- - - - {tmpl_var name="resync_no_server_txt"} - - +
+ +
- - - + +
- -
-
- - - - {tmpl_var name="resync_no_server_txt"} - - +
+ +
- - - + +
- -
-
- - - - {tmpl_var name="resync_no_server_txt"} - - +
+ +
+ + - - + +
- -
-
- - - - {tmpl_var name="resync_no_server_txt"} - - +
+ +
+ + - - + +
- -
-
- - - - {tmpl_var name="resync_no_server_txt"} - - +
+ +
+ + - - + +
- -
-
- - - - {tmpl_var name="resync_no_server_txt"} - - +
+ +
- - - + +
- -
-
- - - - {tmpl_var name="resync_no_server_txt"} - - +
+ +
- -
+ +
- -
-
- - - - {tmpl_var name="resync_no_server_txt"} - - +
+ +
- - - + +
- -
-
- - - - {tmpl_var name="resync_no_server_txt"} - - +
+ +
- + + - + + +
- -
-
- - - - {tmpl_var name="resync_no_server_txt"} - - +
+ +
+ + - - + +
-
+
+ +
+ + + + +
+
+ +
+
+ + +
+
+ +
+ - - -
- - -
+
+ + +
-- GitLab