From 285258959856914c89617184972f5e240d2e06b3 Mon Sep 17 00:00:00 2001 From: BNoiZe Date: Wed, 30 Oct 2013 14:56:41 +0100 Subject: [PATCH 1/2] Moved links fpr adding stuff to top of table, fixed position of search --- templates/Sparkle/admin/admins/admins.tpl | 20 ++++++------- templates/Sparkle/admin/domains/domains.tpl | 4 +-- .../Sparkle/admin/ipsandports/ipsandports.tpl | 12 ++++---- templates/Sparkle/admin/logger/logger.tpl | 13 +++++---- .../Sparkle/admin/phpconfig/overview.tpl | 14 ++++----- .../Sparkle/admin/templates/templates.tpl | 29 +++++++++---------- .../Sparkle/admin/tickets/categories.tpl | 12 ++++---- templates/Sparkle/admin/tickets/tickets.tpl | 4 +-- templates/Sparkle/assets/css/main.css | 5 ++-- .../customer/autoresponder/autoresponder.tpl | 4 +-- .../Sparkle/customer/domains/domainlist.tpl | 4 +-- templates/Sparkle/customer/email/emails.tpl | 5 ++-- .../Sparkle/customer/extras/htaccess.tpl | 24 +++++++-------- .../Sparkle/customer/extras/htpasswds.tpl | 25 ++++++++-------- templates/Sparkle/customer/ftp/accounts.tpl | 4 +-- templates/Sparkle/customer/mysql/mysqls.tpl | 4 +-- .../Sparkle/customer/tickets/tickets.tpl | 12 ++++---- 17 files changed, 98 insertions(+), 97 deletions(-) diff --git a/templates/Sparkle/admin/admins/admins.tpl b/templates/Sparkle/admin/admins/admins.tpl index dd533471..e0b9c320 100644 --- a/templates/Sparkle/admin/admins/admins.tpl +++ b/templates/Sparkle/admin/admins/admins.tpl @@ -15,12 +15,10 @@ $header {$searchcode} - -
-   - {$lng['admin']['admin_add']} -
- +
+   + {$lng['admin']['admin_add']} +
@@ -55,10 +53,12 @@ $header -
-   - {$lng['admin']['admin_add']} -
+ +
+   + {$lng['admin']['admin_add']} +
+ diff --git a/templates/Sparkle/admin/domains/domains.tpl b/templates/Sparkle/admin/domains/domains.tpl index 8fe608b7..99e4bd2e 100644 --- a/templates/Sparkle/admin/domains/domains.tpl +++ b/templates/Sparkle/admin/domains/domains.tpl @@ -15,7 +15,7 @@ {$searchcode} - +
  {$lng['admin']['domain_add']} @@ -61,7 +61,7 @@
- +
  {$lng['admin']['domain_add']} diff --git a/templates/Sparkle/admin/ipsandports/ipsandports.tpl b/templates/Sparkle/admin/ipsandports/ipsandports.tpl index 8b5d4221..505f97ca 100644 --- a/templates/Sparkle/admin/ipsandports/ipsandports.tpl +++ b/templates/Sparkle/admin/ipsandports/ipsandports.tpl @@ -15,12 +15,10 @@ $header {$searchcode}
-
  {$lng['admin']['ipsandports']['add']}
-
@@ -55,10 +53,12 @@ $header -
-   - {$lng['admin']['ipsandports']['add']} -
+ +
+   + {$lng['admin']['ipsandports']['add']} +
+ diff --git a/templates/Sparkle/admin/logger/logger.tpl b/templates/Sparkle/admin/logger/logger.tpl index 597de28e..b5ba3828 100644 --- a/templates/Sparkle/admin/logger/logger.tpl +++ b/templates/Sparkle/admin/logger/logger.tpl @@ -15,12 +15,11 @@ $header {$searchcode} - -
-   - {$lng['logger']['truncate']} -
- + +
+   + {$lng['logger']['truncate']} +
@@ -44,10 +43,12 @@ $header +
  {$lng['logger']['truncate']}
+ diff --git a/templates/Sparkle/admin/phpconfig/overview.tpl b/templates/Sparkle/admin/phpconfig/overview.tpl index 1839a598..72c48ed7 100644 --- a/templates/Sparkle/admin/phpconfig/overview.tpl +++ b/templates/Sparkle/admin/phpconfig/overview.tpl @@ -9,12 +9,10 @@ $header
-
  {$lng['admin']['phpsettings']['addnew']}
-
@@ -29,11 +27,13 @@ $header $tablecontent
- -
-   - {$lng['admin']['phpsettings']['addnew']} -
+ + +
+   + {$lng['admin']['phpsettings']['addnew']} +
+ diff --git a/templates/Sparkle/admin/templates/templates.tpl b/templates/Sparkle/admin/templates/templates.tpl index 5ee6825a..88e6a726 100644 --- a/templates/Sparkle/admin/templates/templates.tpl +++ b/templates/Sparkle/admin/templates/templates.tpl @@ -8,6 +8,13 @@ $header
+ +
+   + {$lng['admin']['templates']['template_add']} +
+ + @@ -20,14 +27,6 @@ $header {$templates}
- - -
-   - {$lng['admin']['templates']['template_add']} -
- -
@@ -41,6 +40,13 @@ $header
+ +
+   + {$lng['admin']['templates']['template_add']} +
+ + @@ -52,13 +58,6 @@ $header {$filetemplates}
- - -
-   - {$lng['admin']['templates']['template_add']} -
-
diff --git a/templates/Sparkle/admin/tickets/categories.tpl b/templates/Sparkle/admin/tickets/categories.tpl index 5c52a83a..45a4f132 100644 --- a/templates/Sparkle/admin/tickets/categories.tpl +++ b/templates/Sparkle/admin/tickets/categories.tpl @@ -15,12 +15,10 @@ $header {$searchcode} -
  {$lng['ticket']['ticket_newcateory']}
- @@ -51,10 +49,12 @@ $header -
-   - {$lng['ticket']['ticket_newcateory']} -
+ +
+   + {$lng['ticket']['ticket_newcateory']} +
+ diff --git a/templates/Sparkle/admin/tickets/tickets.tpl b/templates/Sparkle/admin/tickets/tickets.tpl index 5ae28a6d..31d7d02a 100644 --- a/templates/Sparkle/admin/tickets/tickets.tpl +++ b/templates/Sparkle/admin/tickets/tickets.tpl @@ -15,7 +15,7 @@ $header {$searchcode} - +
  {$lng['ticket']['ticket_new']} @@ -54,7 +54,7 @@ $header - +
  {$lng['ticket']['ticket_new']} diff --git a/templates/Sparkle/assets/css/main.css b/templates/Sparkle/assets/css/main.css index 133e5148..00a66f3e 100644 --- a/templates/Sparkle/assets/css/main.css +++ b/templates/Sparkle/assets/css/main.css @@ -358,10 +358,9 @@ aside.right { } .overviewsearch { - position:absolute; - top:125px; - right:36px; + float: right; font-size:80%; + text-align: right; } .overviewsearch input[type="text"] { width: 150px; diff --git a/templates/Sparkle/customer/autoresponder/autoresponder.tpl b/templates/Sparkle/customer/autoresponder/autoresponder.tpl index f3c362e2..1e44a12e 100644 --- a/templates/Sparkle/customer/autoresponder/autoresponder.tpl +++ b/templates/Sparkle/customer/autoresponder/autoresponder.tpl @@ -9,7 +9,7 @@
- +
  {$lng['autoresponder']['autoresponder_add']} @@ -31,7 +31,7 @@
- +
  {$lng['autoresponder']['autoresponder_add']} diff --git a/templates/Sparkle/customer/domains/domainlist.tpl b/templates/Sparkle/customer/domains/domainlist.tpl index fb7a5daf..68b2a787 100644 --- a/templates/Sparkle/customer/domains/domainlist.tpl +++ b/templates/Sparkle/customer/domains/domainlist.tpl @@ -15,7 +15,7 @@ {$searchcode}
- +
  {$lng['domains']['subdomain_add']} @@ -49,7 +49,7 @@ - +
  {$lng['domains']['subdomain_add']} diff --git a/templates/Sparkle/customer/email/emails.tpl b/templates/Sparkle/customer/email/emails.tpl index be8c7b34..a1584c3d 100644 --- a/templates/Sparkle/customer/email/emails.tpl +++ b/templates/Sparkle/customer/email/emails.tpl @@ -15,7 +15,8 @@ {$searchcode}
- + +
  {$lng['emails']['emails_add']} @@ -54,7 +55,7 @@ - +
  {$lng['emails']['emails_add']} diff --git a/templates/Sparkle/customer/extras/htaccess.tpl b/templates/Sparkle/customer/extras/htaccess.tpl index b33f4d38..a8c691c0 100644 --- a/templates/Sparkle/customer/extras/htaccess.tpl +++ b/templates/Sparkle/customer/extras/htaccess.tpl @@ -15,13 +15,11 @@ {$searchcode}
- -
-   - {$lng['extras']['pathoptions_add']} -
- - +
+   + {$lng['extras']['pathoptions_add']} +
+ @@ -52,11 +50,13 @@

- -
-   - {$lng['extras']['pathoptions_add']} -
+ + +
+   + {$lng['extras']['pathoptions_add']} +
+ diff --git a/templates/Sparkle/customer/extras/htpasswds.tpl b/templates/Sparkle/customer/extras/htpasswds.tpl index 92e70e3c..3dbf7259 100644 --- a/templates/Sparkle/customer/extras/htpasswds.tpl +++ b/templates/Sparkle/customer/extras/htpasswds.tpl @@ -15,12 +15,11 @@ {$searchcode} - -
-   - {$lng['extras']['directoryprotection_add']} -
- + +
+   + {$lng['extras']['directoryprotection_add']} +
@@ -48,12 +47,14 @@

- -
-   - {$lng['extras']['directoryprotection_add']} -
- + + +
+   + {$lng['extras']['directoryprotection_add']} +
+ + $footer diff --git a/templates/Sparkle/customer/ftp/accounts.tpl b/templates/Sparkle/customer/ftp/accounts.tpl index ab105a61..ad866211 100644 --- a/templates/Sparkle/customer/ftp/accounts.tpl +++ b/templates/Sparkle/customer/ftp/accounts.tpl @@ -15,7 +15,7 @@ {$searchcode} - +
  {$lng['ftp']['account_add']} @@ -49,7 +49,7 @@ - +
  {$lng['ftp']['account_add']} diff --git a/templates/Sparkle/customer/mysql/mysqls.tpl b/templates/Sparkle/customer/mysql/mysqls.tpl index d455f809..92f3ab0d 100644 --- a/templates/Sparkle/customer/mysql/mysqls.tpl +++ b/templates/Sparkle/customer/mysql/mysqls.tpl @@ -15,7 +15,7 @@ {$searchcode}
- +
  {$lng['mysql']['database_create']} @@ -51,7 +51,7 @@ - +
  {$lng['mysql']['database_create']} diff --git a/templates/Sparkle/customer/tickets/tickets.tpl b/templates/Sparkle/customer/tickets/tickets.tpl index 77f1ca16..4b6ad6b8 100644 --- a/templates/Sparkle/customer/tickets/tickets.tpl +++ b/templates/Sparkle/customer/tickets/tickets.tpl @@ -11,10 +11,6 @@ $header
-
- {$searchcode} -
-
{$lng['ticket']['supportstatus']}
@@ -28,7 +24,11 @@ $header
- +
+ {$searchcode} +
+ +
  {$lng['ticket']['ticket_new']} @@ -67,7 +67,7 @@ $header - +
  {$lng['ticket']['ticket_new']} From 16989a077d5301a16eb3051ff9107373311e21a5 Mon Sep 17 00:00:00 2001 From: BNoiZe Date: Wed, 30 Oct 2013 14:58:27 +0100 Subject: [PATCH 2/2] Removed unused froxlor client --- .../froxlorclient/class.froxlorclient.php | 369 ------------------ .../froxlorclients/froxlorclient_settings.tpl | 13 - .../froxlorclient_settingsend.tpl | 8 - .../froxlorclient_settingsoverview.tpl | 15 - .../froxlorclient_settingsoverviewgroup.tpl | 12 - .../admin/froxlorclients/froxlorclients.tpl | 29 -- .../froxlorclients/froxlorclients_add.tpl | 37 -- .../froxlorclients/froxlorclients_client.tpl | 28 -- .../froxlorclients/froxlorclients_edit.tpl | 39 -- .../froxlorclients/froxlorclients_tasks.tpl | 10 - .../froxlorclients_tasks_head.tpl | 10 - .../froxlorclients/froxlorclients_view.tpl | 77 ---- .../froxlorclients_view_clientinfo.tpl | 32 -- .../froxlorclients/froxlorclient_settings.tpl | 13 - .../froxlorclient_settingsend.tpl | 8 - .../froxlorclient_settingsoverview.tpl | 15 - .../froxlorclient_settingsoverviewgroup.tpl | 12 - .../admin/froxlorclients/froxlorclients.tpl | 29 -- .../froxlorclients/froxlorclients_add.tpl | 37 -- .../froxlorclients/froxlorclients_client.tpl | 28 -- .../froxlorclients/froxlorclients_edit.tpl | 39 -- .../froxlorclients/froxlorclients_tasks.tpl | 10 - .../froxlorclients_tasks_head.tpl | 10 - .../froxlorclients/froxlorclients_view.tpl | 77 ---- .../froxlorclients_view_clientinfo.tpl | 32 -- 25 files changed, 989 deletions(-) delete mode 100644 lib/classes/froxlorclient/class.froxlorclient.php delete mode 100644 templates/Froxlor/admin/froxlorclients/froxlorclient_settings.tpl delete mode 100644 templates/Froxlor/admin/froxlorclients/froxlorclient_settingsend.tpl delete mode 100644 templates/Froxlor/admin/froxlorclients/froxlorclient_settingsoverview.tpl delete mode 100644 templates/Froxlor/admin/froxlorclients/froxlorclient_settingsoverviewgroup.tpl delete mode 100644 templates/Froxlor/admin/froxlorclients/froxlorclients.tpl delete mode 100644 templates/Froxlor/admin/froxlorclients/froxlorclients_add.tpl delete mode 100644 templates/Froxlor/admin/froxlorclients/froxlorclients_client.tpl delete mode 100644 templates/Froxlor/admin/froxlorclients/froxlorclients_edit.tpl delete mode 100644 templates/Froxlor/admin/froxlorclients/froxlorclients_tasks.tpl delete mode 100644 templates/Froxlor/admin/froxlorclients/froxlorclients_tasks_head.tpl delete mode 100644 templates/Froxlor/admin/froxlorclients/froxlorclients_view.tpl delete mode 100644 templates/Froxlor/admin/froxlorclients/froxlorclients_view_clientinfo.tpl delete mode 100644 templates/Sparkle/admin/froxlorclients/froxlorclient_settings.tpl delete mode 100644 templates/Sparkle/admin/froxlorclients/froxlorclient_settingsend.tpl delete mode 100644 templates/Sparkle/admin/froxlorclients/froxlorclient_settingsoverview.tpl delete mode 100644 templates/Sparkle/admin/froxlorclients/froxlorclient_settingsoverviewgroup.tpl delete mode 100644 templates/Sparkle/admin/froxlorclients/froxlorclients.tpl delete mode 100644 templates/Sparkle/admin/froxlorclients/froxlorclients_add.tpl delete mode 100644 templates/Sparkle/admin/froxlorclients/froxlorclients_client.tpl delete mode 100644 templates/Sparkle/admin/froxlorclients/froxlorclients_edit.tpl delete mode 100644 templates/Sparkle/admin/froxlorclients/froxlorclients_tasks.tpl delete mode 100644 templates/Sparkle/admin/froxlorclients/froxlorclients_tasks_head.tpl delete mode 100644 templates/Sparkle/admin/froxlorclients/froxlorclients_view.tpl delete mode 100644 templates/Sparkle/admin/froxlorclients/froxlorclients_view_clientinfo.tpl diff --git a/lib/classes/froxlorclient/class.froxlorclient.php b/lib/classes/froxlorclient/class.froxlorclient.php deleted file mode 100644 index 5371af2a..00000000 --- a/lib/classes/froxlorclient/class.froxlorclient.php +++ /dev/null @@ -1,369 +0,0 @@ - - * @author Froxlor team (2010-) - * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt - * @package Multiserver - * - * @link http://www.nutime.de/ - * @since 0.9.14-svn8 - * - * Multiserver - FroxlorClient-Class - */ - -class froxlorclient -{ - /** - * Userinfo - * @var array - */ - private $userinfo = array(); - - /** - * Database handler - * @var db - */ - private $db = false; - - /** - * Client ID - * @var cid - */ - private $cid = -1; - - /** - * Client Data Array - * @var c_data - */ - private $c_data = array(); - - /** - * Client Settings_Data Array - * @var s_data - */ - private $s_data = array(); - - /** - * Client-Object-Array - * @var clients - */ - static private $clients = array(); - - /** - * Class constructor. - * - * @param array $userinfo userdetails array of logged in user - * @param resource $db database-object - * @param int $cid client-id - */ - private function __construct($userinfo, $db, $cid = -1) - { - $this->userinfo = $userinfo; - $this->db = $db; - $this->cid = $cid; - - // read data from database - $this->_readData(); - } - - /** - * static function to initialize the class using - * singleton design pattern - * - * @param array $_usernfo userdetails array of logged in user - * @param resource $_db database-object - * @param int $_cid client-id - */ - static public function getInstance($_usernfo, $_db, $_cid) - { - if(!isset(self::$clients[$_cid])) - { - self::$clients[$_cid] = new froxlorclient($_usernfo, $_db, $_cid); - } - - return self::$clients[$_cid]; - } - - /** - * return an array of enabled froxlor-client ids - * - * @param resource mysql-object - * - * @return array - */ - static public function getFroxlorClients($_db = null) - { - $sql = "SELECT `id` FROM `".TABLE_FROXLOR_CLIENTS."` WHERE `enabled` = '1';"; - $res = $_db->query($sql); - $result = array(); - while($_r = mysql_fetch_array($res)) - { - $result[] = $_r['id']; - } - return $result; - } - - /** - * Insert new client to database - */ - public function Insert() - { - $this->db->query("INSERT INTO - `" . TABLE_FROXLOR_CLIENTS . "` - SET - `name` = '" . $this->db->escape($this->Get('name')) . "', - `desc` = '" . $this->db->escape($this->Get('desc')) . "', - `enabled` = '" . (int)$this->Get('enabled') . "'; - "); - $this->cid = $this->db->insert_id(); - return $this->cid; - } - - /** - * Update data in database - */ - public function Update() - { - $this->db->query("UPDATE - `" . TABLE_FROXLOR_CLIENTS . "` - SET - `name` = '" . $this->db->escape($this->Get('name')) . "', - `desc` = '" . $this->db->escape($this->Get('desc')) . "', - `enabled` = '" . (int)$this->Get('enabled') . "' - WHERE - `id` = '" . (int)$this->cid . "'; - "); - return true; - } - - /** - * This function removes a Froxlor-Client and its settings - * from the database. Optionally the Froxlor-Client data - * can be removed by setting the $delete_me parameter - * - * @param bool $delete_me removes client-data (not customer data) on the client - * - * @return bool - * - * @TODO - * - remove client settings in panel_settings (sid = client-id) - * - implement $delete_me parameter - */ - public function Delete($delete_me = false) - { - // delete froxlor-client from the database - $this->db->query('DELETE FROM - `' . TABLE_FROXLOR_CLIENTS . '` - WHERE - `id` = "' . (int)$this->cid . '"; - '); - - // Delete settings from panel_settings - $this->db->query('DELETE FROM - `' . TABLE_PANEL_SETTINGS . '` - WHERE - `sid` = "' . (int)$this->cid . '"; - '); - - return true; - } - - /** - * return the complete client-settings array - * for the settings page - */ - public function getSettingsArray() - { - return $this->Get('settings'); - } - - /** - * get a value from the internal data array - * - * @param string $_var - * @param string $_vartrusted - * - * @return mixed or null if not found - */ - public function Get($_var = '', $_vartrusted = false) - { - if($_var != '') - { - if(!$_vartrusted) - { - $_var = htmlspecialchars($_var); - } - - if(isset($this->c_data[$_var])) - { - return $this->c_data[$_var]; - } - else - { - return null; - } - } - } - - /** - * set a value in the internal data array - * - * @param string $_var - * @param string $_value - * @param bool $_vartrusted - * @param bool $_valuetrusted - */ - public function Set($_var = '', $_value = '', $_vartrusted = false, $_valuetrusted = false) - { - if($_var != '' - && $_value != '' - ) { - if(!$_vartrusted) - { - $_var = htmlspecialchars($_var); - } - - if(!$_valuetrusted) - { - $_value = htmlspecialchars($_value); - } - - $this->c_data[$_var] = $_value; - } - } - - /** - * get a value from the internal settings array - * - * @param string $_grp - * @param string $_var - * @param bool $_grptrusted - * @param bool $_vartrusted - * - * @return mixed or null if not found - */ - public function getSetting($_grp = '', $_var = '', $_grptrusted = false, $_vartrusted = false) - { - if($_grp != '' - && $_var != '' - ) { - - if(!$_grptrusted) - { - $_grp = htmlspecialchars($_grp); - } - - if(!$_vartrusted) - { - $_var = htmlspecialchars($_var); - } - - if(isset($this->c_data['settings'][$_grp][$_var])) - { - return $this->c_data['settings'][$_grp][$_var]; - } - else - { - return null; - } - } - } - - /** - * set a value in the internal settings array - * - * @param string $_grp - * @param string $_var - * @param string $_value - * @param bool $_grptrusted - * @param bool $_vartrusted - * @param bool $_valuetrusted - */ - public function setSetting($_grp = '', $_var = '', $_value = '', $_grptrusted = false, $_vartrusted = false, $_valuetrusted = false) - { - if($_grp != '' - && $_var != '' - && $_value != '' - ) { - if(!$_grptrusted) - { - $_grp = htmlspecialchars($_grp); - } - - if(!$_vartrusted) - { - $_var = htmlspecialchars($_var); - } - - if(!$_valuetrusted) - { - $_value = htmlspecialchars($_value); - } - - if(!isset($this->c_data['settings']) || !is_array($this->c_data['settings'])) { - $this->c_data['settings'] = array(); - } - - if(!isset($this->c_data['settings'][$_grp]) || !is_array($this->c_data['settings'][$_grp])) { - $this->c_data['settings'][$_grp] = array(); - } - - $this->c_data['settings'][$_grp][$_var] = $_value; - } - } - - /** - * read client settings from database - */ - private function _readSettings() - { - if(isset($this->cid) - && $this->cid != - 1 - ) { - $spath = makeCorrectDir(dirname(dirname(dirname(dirname(__FILE__))))); - $this->s_data = loadConfigArrayDir( - makeCorrectDir($spath.'/actions/admin/settings/'), - makeCorrectDir($spath.'/actions/multiserver/clientsettings/') - ); - $settings = loadSettings($this->s_data, $this->db, $this->cid); - - foreach($settings as $group => $fv) - { - foreach($fv as $field => $value) - { - $this->setSetting($group, $field, $value, true, true, true); - } - } - } - } - - /** - * Read client data from database. - */ - private function _readData() - { - if(isset($this->cid) - && $this->cid != - 1 - ) { - $_client = $this->db->query_first('SELECT * FROM `' . TABLE_FROXLOR_CLIENTS . '` WHERE `id` = "' . $this->cid . '"'); - - foreach($_client as $field => $value) - { - $this->Set($field, $value, true, true); - } - - // after we have details about the client, - // we need its settings too - $this->_readSettings(); - } - } -} diff --git a/templates/Froxlor/admin/froxlorclients/froxlorclient_settings.tpl b/templates/Froxlor/admin/froxlorclients/froxlorclient_settings.tpl deleted file mode 100644 index 5991da67..00000000 --- a/templates/Froxlor/admin/froxlorclients/froxlorclient_settings.tpl +++ /dev/null @@ -1,13 +0,0 @@ -
- - - - $fields - - - -
 {$lng['admin']['froxlorclient_settings']}  - "{$client->Get('name')}" - [{$lng['admin']['configfiles']['compactoverview']}]
- -
diff --git a/templates/Froxlor/admin/froxlorclients/froxlorclient_settingsend.tpl b/templates/Froxlor/admin/froxlorclients/froxlorclient_settingsend.tpl deleted file mode 100644 index 27b0931d..00000000 --- a/templates/Froxlor/admin/froxlorclients/froxlorclient_settingsend.tpl +++ /dev/null @@ -1,8 +0,0 @@ - - - - - -
-
-$footer diff --git a/templates/Froxlor/admin/froxlorclients/froxlorclient_settingsoverview.tpl b/templates/Froxlor/admin/froxlorclients/froxlorclient_settingsoverview.tpl deleted file mode 100644 index 546067ae..00000000 --- a/templates/Froxlor/admin/froxlorclients/froxlorclient_settingsoverview.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - - - - $fields - - - -
-  {$lng['admin']['configfiles']['serverconfiguration']}  - "{$client->Get('name')}" - [{$lng['admin']['configfiles']['overview']}] -
-   -
diff --git a/templates/Froxlor/admin/froxlorclients/froxlorclient_settingsoverviewgroup.tpl b/templates/Froxlor/admin/froxlorclients/froxlorclient_settingsoverviewgroup.tpl deleted file mode 100644 index e9a96778..00000000 --- a/templates/Froxlor/admin/froxlorclients/froxlorclient_settingsoverviewgroup.tpl +++ /dev/null @@ -1,12 +0,0 @@ - - -  {$title} - - {$option} - - - {$lng['admin']['configfiles']['serverconfiguration']} - - - - diff --git a/templates/Froxlor/admin/froxlorclients/froxlorclients.tpl b/templates/Froxlor/admin/froxlorclients/froxlorclients.tpl deleted file mode 100644 index 921daa5a..00000000 --- a/templates/Froxlor/admin/froxlorclients/froxlorclients.tpl +++ /dev/null @@ -1,29 +0,0 @@ -$header -
- - - - - - - - - - - - - - $froxlorclients - - - - - - - - -
 {$lng['menue']['multiserver']['clients']}{$searchcode}
#{$lng['admin']['froxlorclients']['name']} {$arrowcode['name']}
{$lng['admin']['froxlorclients']['desc']}		{$lng['admin']['froxlorclients']['enabled']} {$arrowcode['enabled']}{$sortcode}
{$pagingcode}
{$lng['admin']['froxlorclients']['add']}
-
-
-
-$footer diff --git a/templates/Froxlor/admin/froxlorclients/froxlorclients_add.tpl b/templates/Froxlor/admin/froxlorclients/froxlorclients_add.tpl deleted file mode 100644 index b5de16cd..00000000 --- a/templates/Froxlor/admin/froxlorclients/froxlorclients_add.tpl +++ /dev/null @@ -1,37 +0,0 @@ -$header -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
 {$lng['admin']['froxlorclients']['add']}
-  {$lng['admin']['froxlorclients']['client']} - - -
{$lng['admin']['froxlorclients']['name']}:
{$lng['admin']['froxlorclients']['desc']}:
{$lng['admin']['froxlorclients']['enabled']}:$client_enabled
-
-
-
-$footer diff --git a/templates/Froxlor/admin/froxlorclients/froxlorclients_client.tpl b/templates/Froxlor/admin/froxlorclients/froxlorclients_client.tpl deleted file mode 100644 index b4a626a9..00000000 --- a/templates/Froxlor/admin/froxlorclients/froxlorclients_client.tpl +++ /dev/null @@ -1,28 +0,0 @@ - - - - Client #{$row['id']} - - - - - {$row['name']} -
{$row['desc']} - - - - - {$lng['panel']['yes']} - - - - {$lng['panel']['no']} - - - - - - {$lng['admin']['froxlorclients']['view']} - - - diff --git a/templates/Froxlor/admin/froxlorclients/froxlorclients_edit.tpl b/templates/Froxlor/admin/froxlorclients/froxlorclients_edit.tpl deleted file mode 100644 index 7c71840b..00000000 --- a/templates/Froxlor/admin/froxlorclients/froxlorclients_edit.tpl +++ /dev/null @@ -1,39 +0,0 @@ -$header -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 {$lng['admin']['froxlorclients']['edit']}
-  {$lng['admin']['froxlorclients']['client']} - - -
{$lng['admin']['froxlorclients']['name']}:
{$lng['admin']['froxlorclients']['desc']}:
{$lng['admin']['froxlorclients']['enabled']}:$client_enabled
-
-
-
-$footer diff --git a/templates/Froxlor/admin/froxlorclients/froxlorclients_tasks.tpl b/templates/Froxlor/admin/froxlorclients/froxlorclients_tasks.tpl deleted file mode 100644 index acc16481..00000000 --- a/templates/Froxlor/admin/froxlorclients/froxlorclients_tasks.tpl +++ /dev/null @@ -1,10 +0,0 @@ -$header - - - - - {$outstanding_tasks} -
 {$lng['admin']['multiservercronjobs']}
-
-
-$footer diff --git a/templates/Froxlor/admin/froxlorclients/froxlorclients_tasks_head.tpl b/templates/Froxlor/admin/froxlorclients/froxlorclients_tasks_head.tpl deleted file mode 100644 index d6ca5a45..00000000 --- a/templates/Froxlor/admin/froxlorclients/froxlorclients_tasks_head.tpl +++ /dev/null @@ -1,10 +0,0 @@ - - - - {$client->Get('name')} - -

- {$client->Get('name')} - - -
    diff --git a/templates/Froxlor/admin/froxlorclients/froxlorclients_view.tpl b/templates/Froxlor/admin/froxlorclients/froxlorclients_view.tpl deleted file mode 100644 index fd943a79..00000000 --- a/templates/Froxlor/admin/froxlorclients/froxlorclients_view.tpl +++ /dev/null @@ -1,77 +0,0 @@ -$header -
    - - - - - - - - - - - - - - -
     {$lng['menue']['multiserver']['clients']} "{$client->Get('name')}"
    - Client #{$row['id']} - -

    Froxlor-client "{$client->Get('name')}"

    -

    {$client->Get('desc')}

    -
    - - - {$lng['admin']['froxlorclients']['settings']} -   - - {$lng['admin']['froxlorclients']['deploy']} -   - - {$lng['admin']['froxlorclients']['settings']} :: {$lng['admin']['froxlorclients']['clientdisabled']}  - {$lng['admin']['froxlorclients']['deploy']} :: {$lng['admin']['froxlorclients']['clientdisabled']} - - - {$lng['panel']['edit']} -   - - {$lng['panel']['delete']} - -
    -

    - - - - - - - - - - - - - - - - - - - - - - $info -
    {$lng['froxlorclient']['base_config']}
    - {$lastrefresh} - - - {$lng['admin']['froxlorclients']['refreshsysinfo']} - - - {$lastrefresh} - -
    {$lng['froxlorclient']['ipaddress']}:{$client->getSetting('client', 'ipaddress')}
    {$lng['froxlorclient']['hostname']}:{$client->getSetting('client', 'hostname')}
    {$lng['froxlorclient']['install_destination']}:{$client->getSetting('client', 'install_destination')}
    -
    -
    -
    -$footer diff --git a/templates/Froxlor/admin/froxlorclients/froxlorclients_view_clientinfo.tpl b/templates/Froxlor/admin/froxlorclients/froxlorclients_view_clientinfo.tpl deleted file mode 100644 index b020d3b0..00000000 --- a/templates/Froxlor/admin/froxlorclients/froxlorclients_view_clientinfo.tpl +++ /dev/null @@ -1,32 +0,0 @@ - - Kernel: - {$client->getSetting('clientinfo', 'kernel')} - - - Memory: - {$client->getSetting('clientinfo', 'memory')} - - - Swap: - {$client->getSetting('clientinfo', 'swap')} - - - CPU: - {$client->getSetting('clientinfo', 'cpu')} - - - Load: - {$client->getSetting('clientinfo', 'loadavg')} - - - Uptime: - {$client->getSetting('clientinfo', 'uptime')} - - - Diskusage: - {$client->getSetting('clientinfo', 'diskusage')} - - - PHP version: - {$client->getSetting('clientinfo', 'phpversion')} - diff --git a/templates/Sparkle/admin/froxlorclients/froxlorclient_settings.tpl b/templates/Sparkle/admin/froxlorclients/froxlorclient_settings.tpl deleted file mode 100644 index 5991da67..00000000 --- a/templates/Sparkle/admin/froxlorclients/froxlorclient_settings.tpl +++ /dev/null @@ -1,13 +0,0 @@ - - - - - $fields - - - -
     {$lng['admin']['froxlorclient_settings']}  - "{$client->Get('name')}" - [{$lng['admin']['configfiles']['compactoverview']}]
    - -
    diff --git a/templates/Sparkle/admin/froxlorclients/froxlorclient_settingsend.tpl b/templates/Sparkle/admin/froxlorclients/froxlorclient_settingsend.tpl deleted file mode 100644 index 27b0931d..00000000 --- a/templates/Sparkle/admin/froxlorclients/froxlorclient_settingsend.tpl +++ /dev/null @@ -1,8 +0,0 @@ - - - - - -
    -
    -$footer diff --git a/templates/Sparkle/admin/froxlorclients/froxlorclient_settingsoverview.tpl b/templates/Sparkle/admin/froxlorclients/froxlorclient_settingsoverview.tpl deleted file mode 100644 index 546067ae..00000000 --- a/templates/Sparkle/admin/froxlorclients/froxlorclient_settingsoverview.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - - - - $fields - - - -
    -  {$lng['admin']['configfiles']['serverconfiguration']}  - "{$client->Get('name')}" - [{$lng['admin']['configfiles']['overview']}] -
    -   -
    diff --git a/templates/Sparkle/admin/froxlorclients/froxlorclient_settingsoverviewgroup.tpl b/templates/Sparkle/admin/froxlorclients/froxlorclient_settingsoverviewgroup.tpl deleted file mode 100644 index e9a96778..00000000 --- a/templates/Sparkle/admin/froxlorclients/froxlorclient_settingsoverviewgroup.tpl +++ /dev/null @@ -1,12 +0,0 @@ - - -  {$title} - - {$option} - - - {$lng['admin']['configfiles']['serverconfiguration']} - - - - diff --git a/templates/Sparkle/admin/froxlorclients/froxlorclients.tpl b/templates/Sparkle/admin/froxlorclients/froxlorclients.tpl deleted file mode 100644 index 921daa5a..00000000 --- a/templates/Sparkle/admin/froxlorclients/froxlorclients.tpl +++ /dev/null @@ -1,29 +0,0 @@ -$header -
    - - - - - - - - - - - - - - $froxlorclients - - - - - - - - -
     {$lng['menue']['multiserver']['clients']}{$searchcode}
    #{$lng['admin']['froxlorclients']['name']} {$arrowcode['name']}
    {$lng['admin']['froxlorclients']['desc']}    		{$lng['admin']['froxlorclients']['enabled']} {$arrowcode['enabled']}{$sortcode}
    {$pagingcode}
    {$lng['admin']['froxlorclients']['add']}
    -
    -
    -
    -$footer diff --git a/templates/Sparkle/admin/froxlorclients/froxlorclients_add.tpl b/templates/Sparkle/admin/froxlorclients/froxlorclients_add.tpl deleted file mode 100644 index b5de16cd..00000000 --- a/templates/Sparkle/admin/froxlorclients/froxlorclients_add.tpl +++ /dev/null @@ -1,37 +0,0 @@ -$header -
    - - - - - - - - - - - - - - - - - - - - - - - - - - -
     {$lng['admin']['froxlorclients']['add']}
    -  {$lng['admin']['froxlorclients']['client']} - - -
    {$lng['admin']['froxlorclients']['name']}:
    {$lng['admin']['froxlorclients']['desc']}:
    {$lng['admin']['froxlorclients']['enabled']}:$client_enabled
    -
    -
    -
    -$footer diff --git a/templates/Sparkle/admin/froxlorclients/froxlorclients_client.tpl b/templates/Sparkle/admin/froxlorclients/froxlorclients_client.tpl deleted file mode 100644 index b4a626a9..00000000 --- a/templates/Sparkle/admin/froxlorclients/froxlorclients_client.tpl +++ /dev/null @@ -1,28 +0,0 @@ - - - - Client #{$row['id']} - - - - - {$row['name']} -
    {$row['desc']} - - - - - {$lng['panel']['yes']} - - - - {$lng['panel']['no']} - - - - - - {$lng['admin']['froxlorclients']['view']} - - - diff --git a/templates/Sparkle/admin/froxlorclients/froxlorclients_edit.tpl b/templates/Sparkle/admin/froxlorclients/froxlorclients_edit.tpl deleted file mode 100644 index 7c71840b..00000000 --- a/templates/Sparkle/admin/froxlorclients/froxlorclients_edit.tpl +++ /dev/null @@ -1,39 +0,0 @@ -$header -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     {$lng['admin']['froxlorclients']['edit']}
    -  {$lng['admin']['froxlorclients']['client']} - - -
    {$lng['admin']['froxlorclients']['name']}:
    {$lng['admin']['froxlorclients']['desc']}:
    {$lng['admin']['froxlorclients']['enabled']}:$client_enabled
    -
    -
    -
    -$footer diff --git a/templates/Sparkle/admin/froxlorclients/froxlorclients_tasks.tpl b/templates/Sparkle/admin/froxlorclients/froxlorclients_tasks.tpl deleted file mode 100644 index acc16481..00000000 --- a/templates/Sparkle/admin/froxlorclients/froxlorclients_tasks.tpl +++ /dev/null @@ -1,10 +0,0 @@ -$header - - - - - {$outstanding_tasks} -
     {$lng['admin']['multiservercronjobs']}
    -
    -
    -$footer diff --git a/templates/Sparkle/admin/froxlorclients/froxlorclients_tasks_head.tpl b/templates/Sparkle/admin/froxlorclients/froxlorclients_tasks_head.tpl deleted file mode 100644 index d6ca5a45..00000000 --- a/templates/Sparkle/admin/froxlorclients/froxlorclients_tasks_head.tpl +++ /dev/null @@ -1,10 +0,0 @@ - - - - {$client->Get('name')} - -

    - {$client->Get('name')} - - -
      diff --git a/templates/Sparkle/admin/froxlorclients/froxlorclients_view.tpl b/templates/Sparkle/admin/froxlorclients/froxlorclients_view.tpl deleted file mode 100644 index fd943a79..00000000 --- a/templates/Sparkle/admin/froxlorclients/froxlorclients_view.tpl +++ /dev/null @@ -1,77 +0,0 @@ -$header -
      - - - - - - - - - - - - - - -
       {$lng['menue']['multiserver']['clients']} "{$client->Get('name')}"
      - Client #{$row['id']} - -

      Froxlor-client "{$client->Get('name')}"

      -

      {$client->Get('desc')}

      -
      - - - {$lng['admin']['froxlorclients']['settings']} -   - - {$lng['admin']['froxlorclients']['deploy']} -   - - {$lng['admin']['froxlorclients']['settings']} :: {$lng['admin']['froxlorclients']['clientdisabled']}  - {$lng['admin']['froxlorclients']['deploy']} :: {$lng['admin']['froxlorclients']['clientdisabled']} - - - {$lng['panel']['edit']} -   - - {$lng['panel']['delete']} - -
      -

      - - - - - - - - - - - - - - - - - - - - - - $info -
      {$lng['froxlorclient']['base_config']}
      - {$lastrefresh} - - - {$lng['admin']['froxlorclients']['refreshsysinfo']} - - - {$lastrefresh} - -
      {$lng['froxlorclient']['ipaddress']}:{$client->getSetting('client', 'ipaddress')}
      {$lng['froxlorclient']['hostname']}:{$client->getSetting('client', 'hostname')}
      {$lng['froxlorclient']['install_destination']}:{$client->getSetting('client', 'install_destination')}
      -
      -
      -
      -$footer diff --git a/templates/Sparkle/admin/froxlorclients/froxlorclients_view_clientinfo.tpl b/templates/Sparkle/admin/froxlorclients/froxlorclients_view_clientinfo.tpl deleted file mode 100644 index b020d3b0..00000000 --- a/templates/Sparkle/admin/froxlorclients/froxlorclients_view_clientinfo.tpl +++ /dev/null @@ -1,32 +0,0 @@ - - Kernel: - {$client->getSetting('clientinfo', 'kernel')} - - - Memory: - {$client->getSetting('clientinfo', 'memory')} - - - Swap: - {$client->getSetting('clientinfo', 'swap')} - - - CPU: - {$client->getSetting('clientinfo', 'cpu')} - - - Load: - {$client->getSetting('clientinfo', 'loadavg')} - - - Uptime: - {$client->getSetting('clientinfo', 'uptime')} - - - Diskusage: - {$client->getSetting('clientinfo', 'diskusage')} - - - PHP version: - {$client->getSetting('clientinfo', 'phpversion')} -