From 77b7fa9e42ededcc0afe7c683617dcd048f530c9 Mon Sep 17 00:00:00 2001 From: mcramer Date: Fri, 24 Aug 2012 11:32:11 +0000 Subject: [PATCH] Removed obsolete default-v2 files Corrected paths in main tpl --- .../web/admin/form/tpl_default-v2.tform.php | 113 --------------- .../lib/interface.d/tpl_default-v2.menu.php | 7 - .../lib/lang/ar_tpl_default-v2_admin.lng | 18 --- .../lib/lang/bg_tpl_default-v2_admin.lng | 18 --- .../lib/lang/br_tpl_default-v2_admin.lng | 18 --- .../lib/lang/cz_tpl_default-v2_admin.lng | 18 --- .../lib/lang/de_tpl_default-v2_admin.lng | 18 --- .../lib/lang/el_tpl_default-v2_admin.lng | 18 --- .../lib/lang/en_tpl_default-v2_admin.lng | 18 --- .../lib/lang/es_tpl_default-v2_admin.lng | 18 --- .../lib/lang/fi_tpl_default-v2_admin.lng | 18 --- .../lib/lang/fr_tpl_default-v2_admin.lng | 18 --- .../lib/lang/hr_tpl_default-v2_admin.lng | 18 --- .../lib/lang/hu_tpl_default-v2_admin.lng | 18 --- .../lib/lang/id_tpl_default-v2_admin.lng | 18 --- .../lib/lang/it_tpl_default-v2_admin.lng | 18 --- .../lib/lang/ja_tpl_default-v2_admin.lng | 18 --- .../lib/lang/nl_tpl_default-v2_admin.lng | 18 --- .../lib/lang/pl_tpl_default-v2_admin.lng | 18 --- .../lib/lang/pt_tpl_default-v2_admin.lng | 18 --- .../lib/lang/ro_tpl_default-v2_admin.lng | 18 --- .../lib/lang/ru_tpl_default-v2_admin.lng | 18 --- .../lib/lang/se_tpl_default-v2_admin.lng | 18 --- .../lib/lang/sk_tpl_default-v2_admin.lng | 18 --- .../lib/lang/tr_tpl_default-v2_admin.lng | 18 --- .../admin/templates/tpl_default-v2_basic.htm | 23 --- interface/web/admin/tpl_default-v2.php | 73 ---------- .../templates/admin/tpl_default-v2_basic.htm | 23 --- .../templates/tools/tpl_default-v2.htm | 37 ----- .../web/themes/default/templates/main.tpl.htm | 16 +- .../web/tools/form/tpl_default-v2.tform.php | 137 ------------------ .../lib/interface.d/tpl_default-v2.menu.php | 7 - .../web/tools/lib/lang/ar_tpl_default-v2.lng | 7 - .../web/tools/lib/lang/bg_tpl_default-v2.lng | 7 - .../web/tools/lib/lang/br_tpl_default-v2.lng | 7 - .../web/tools/lib/lang/cz_tpl_default-v2.lng | 7 - .../web/tools/lib/lang/de_tpl_default-v2.lng | 7 - .../web/tools/lib/lang/el_tpl_default-v2.lng | 7 - .../web/tools/lib/lang/en_tpl_default-v2.lng | 7 - .../web/tools/lib/lang/es_tpl_default-v2.lng | 7 - .../web/tools/lib/lang/fi_tpl_default-v2.lng | 7 - .../web/tools/lib/lang/fr_tpl_default-v2.lng | 7 - .../web/tools/lib/lang/hr_tpl_default-v2.lng | 7 - .../web/tools/lib/lang/hu_tpl_default-v2.lng | 7 - .../web/tools/lib/lang/id_tpl_default-v2.lng | 7 - .../web/tools/lib/lang/it_tpl_default-v2.lng | 7 - .../web/tools/lib/lang/ja_tpl_default-v2.lng | 7 - .../web/tools/lib/lang/nl_tpl_default-v2.lng | 7 - .../web/tools/lib/lang/pl_tpl_default-v2.lng | 7 - .../web/tools/lib/lang/pt_tpl_default-v2.lng | 7 - .../web/tools/lib/lang/ro_tpl_default-v2.lng | 7 - .../web/tools/lib/lang/ru_tpl_default-v2.lng | 7 - .../web/tools/lib/lang/se_tpl_default-v2.lng | 7 - .../web/tools/lib/lang/sk_tpl_default-v2.lng | 7 - .../web/tools/lib/lang/tr_tpl_default-v2.lng | 7 - .../web/tools/templates/tpl_default-v2.htm | 37 ----- interface/web/tools/tpl_default-v2.php | 108 -------------- 57 files changed, 8 insertions(+), 1148 deletions(-) delete mode 100644 interface/web/admin/form/tpl_default-v2.tform.php delete mode 100644 interface/web/admin/lib/interface.d/tpl_default-v2.menu.php delete mode 100644 interface/web/admin/lib/lang/ar_tpl_default-v2_admin.lng delete mode 100644 interface/web/admin/lib/lang/bg_tpl_default-v2_admin.lng delete mode 100644 interface/web/admin/lib/lang/br_tpl_default-v2_admin.lng delete mode 100644 interface/web/admin/lib/lang/cz_tpl_default-v2_admin.lng delete mode 100644 interface/web/admin/lib/lang/de_tpl_default-v2_admin.lng delete mode 100644 interface/web/admin/lib/lang/el_tpl_default-v2_admin.lng delete mode 100644 interface/web/admin/lib/lang/en_tpl_default-v2_admin.lng delete mode 100644 interface/web/admin/lib/lang/es_tpl_default-v2_admin.lng delete mode 100644 interface/web/admin/lib/lang/fi_tpl_default-v2_admin.lng delete mode 100644 interface/web/admin/lib/lang/fr_tpl_default-v2_admin.lng delete mode 100644 interface/web/admin/lib/lang/hr_tpl_default-v2_admin.lng delete mode 100644 interface/web/admin/lib/lang/hu_tpl_default-v2_admin.lng delete mode 100644 interface/web/admin/lib/lang/id_tpl_default-v2_admin.lng delete mode 100644 interface/web/admin/lib/lang/it_tpl_default-v2_admin.lng delete mode 100644 interface/web/admin/lib/lang/ja_tpl_default-v2_admin.lng delete mode 100644 interface/web/admin/lib/lang/nl_tpl_default-v2_admin.lng delete mode 100644 interface/web/admin/lib/lang/pl_tpl_default-v2_admin.lng delete mode 100644 interface/web/admin/lib/lang/pt_tpl_default-v2_admin.lng delete mode 100644 interface/web/admin/lib/lang/ro_tpl_default-v2_admin.lng delete mode 100644 interface/web/admin/lib/lang/ru_tpl_default-v2_admin.lng delete mode 100644 interface/web/admin/lib/lang/se_tpl_default-v2_admin.lng delete mode 100644 interface/web/admin/lib/lang/sk_tpl_default-v2_admin.lng delete mode 100644 interface/web/admin/lib/lang/tr_tpl_default-v2_admin.lng delete mode 100644 interface/web/admin/templates/tpl_default-v2_basic.htm delete mode 100644 interface/web/admin/tpl_default-v2.php delete mode 100644 interface/web/themes/default-304/templates/admin/tpl_default-v2_basic.htm delete mode 100644 interface/web/themes/default-304/templates/tools/tpl_default-v2.htm delete mode 100644 interface/web/tools/form/tpl_default-v2.tform.php delete mode 100644 interface/web/tools/lib/interface.d/tpl_default-v2.menu.php delete mode 100644 interface/web/tools/lib/lang/ar_tpl_default-v2.lng delete mode 100644 interface/web/tools/lib/lang/bg_tpl_default-v2.lng delete mode 100644 interface/web/tools/lib/lang/br_tpl_default-v2.lng delete mode 100644 interface/web/tools/lib/lang/cz_tpl_default-v2.lng delete mode 100644 interface/web/tools/lib/lang/de_tpl_default-v2.lng delete mode 100644 interface/web/tools/lib/lang/el_tpl_default-v2.lng delete mode 100644 interface/web/tools/lib/lang/en_tpl_default-v2.lng delete mode 100644 interface/web/tools/lib/lang/es_tpl_default-v2.lng delete mode 100644 interface/web/tools/lib/lang/fi_tpl_default-v2.lng delete mode 100644 interface/web/tools/lib/lang/fr_tpl_default-v2.lng delete mode 100644 interface/web/tools/lib/lang/hr_tpl_default-v2.lng delete mode 100644 interface/web/tools/lib/lang/hu_tpl_default-v2.lng delete mode 100644 interface/web/tools/lib/lang/id_tpl_default-v2.lng delete mode 100644 interface/web/tools/lib/lang/it_tpl_default-v2.lng delete mode 100644 interface/web/tools/lib/lang/ja_tpl_default-v2.lng delete mode 100644 interface/web/tools/lib/lang/nl_tpl_default-v2.lng delete mode 100644 interface/web/tools/lib/lang/pl_tpl_default-v2.lng delete mode 100644 interface/web/tools/lib/lang/pt_tpl_default-v2.lng delete mode 100644 interface/web/tools/lib/lang/ro_tpl_default-v2.lng delete mode 100644 interface/web/tools/lib/lang/ru_tpl_default-v2.lng delete mode 100644 interface/web/tools/lib/lang/se_tpl_default-v2.lng delete mode 100644 interface/web/tools/lib/lang/sk_tpl_default-v2.lng delete mode 100644 interface/web/tools/lib/lang/tr_tpl_default-v2.lng delete mode 100644 interface/web/tools/templates/tpl_default-v2.htm delete mode 100644 interface/web/tools/tpl_default-v2.php diff --git a/interface/web/admin/form/tpl_default-v2.tform.php b/interface/web/admin/form/tpl_default-v2.tform.php deleted file mode 100644 index 4b922962c..000000000 --- a/interface/web/admin/form/tpl_default-v2.tform.php +++ /dev/null @@ -1,113 +0,0 @@ - 0 id must match with id of current user -$form["auth_preset"]["groupid"] = 0; // 0 = default groupid of the user, > 0 id must match with groupid of current user -$form["auth_preset"]["perm_user"] = 'riud'; //r = read, i = insert, u = update, d = delete -$form["auth_preset"]["perm_group"] = 'riud'; //r = read, i = insert, u = update, d = delete -$form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete - -$form["tabs"]['basic'] = array ( - 'title' => "Basic Settings", - 'width' => 80, - 'template' => "templates/tpl_default-v2_basic.htm", - 'fields' => array ( - ################################## - # Beginn Datenbankfelder - ################################## - 'username' => array ( - 'datatype' => 'VARCHAR', - 'formtype' => 'TEXT', - 'validators' => '', - 'default' => 'global', - 'value' => 'global', - 'separator' => '', - 'width' => '40', - 'maxlength' => '64' - ), - 'logo_url' => array ( - 'datatype' => 'VARCHAR', - 'formtype' => 'TEXT', - 'validators' => '', - 'default' => '', - 'value' => '', - 'separator' => '', - 'width' => '40', - 'maxlength' => '255' - ), - ################################## - # ENDE Datenbankfelder - ################################## - ) -); - -?> \ No newline at end of file diff --git a/interface/web/admin/lib/interface.d/tpl_default-v2.menu.php b/interface/web/admin/lib/interface.d/tpl_default-v2.menu.php deleted file mode 100644 index 0a7d10c4f..000000000 --- a/interface/web/admin/lib/interface.d/tpl_default-v2.menu.php +++ /dev/null @@ -1,7 +0,0 @@ - 'Default-v2 Theme', - 'target' => 'content', - 'link' => 'admin/tpl_default-v2.php', - 'html_id' => 'tpl_default-v2'); -?> diff --git a/interface/web/admin/lib/lang/ar_tpl_default-v2_admin.lng b/interface/web/admin/lib/lang/ar_tpl_default-v2_admin.lng deleted file mode 100644 index 3e197606c..000000000 --- a/interface/web/admin/lib/lang/ar_tpl_default-v2_admin.lng +++ /dev/null @@ -1,18 +0,0 @@ - diff --git a/interface/web/admin/lib/lang/bg_tpl_default-v2_admin.lng b/interface/web/admin/lib/lang/bg_tpl_default-v2_admin.lng deleted file mode 100644 index 3e197606c..000000000 --- a/interface/web/admin/lib/lang/bg_tpl_default-v2_admin.lng +++ /dev/null @@ -1,18 +0,0 @@ - diff --git a/interface/web/admin/lib/lang/br_tpl_default-v2_admin.lng b/interface/web/admin/lib/lang/br_tpl_default-v2_admin.lng deleted file mode 100644 index 3e197606c..000000000 --- a/interface/web/admin/lib/lang/br_tpl_default-v2_admin.lng +++ /dev/null @@ -1,18 +0,0 @@ - diff --git a/interface/web/admin/lib/lang/cz_tpl_default-v2_admin.lng b/interface/web/admin/lib/lang/cz_tpl_default-v2_admin.lng deleted file mode 100644 index 3e197606c..000000000 --- a/interface/web/admin/lib/lang/cz_tpl_default-v2_admin.lng +++ /dev/null @@ -1,18 +0,0 @@ - diff --git a/interface/web/admin/lib/lang/de_tpl_default-v2_admin.lng b/interface/web/admin/lib/lang/de_tpl_default-v2_admin.lng deleted file mode 100644 index ef0eda170..000000000 --- a/interface/web/admin/lib/lang/de_tpl_default-v2_admin.lng +++ /dev/null @@ -1,18 +0,0 @@ - diff --git a/interface/web/admin/lib/lang/el_tpl_default-v2_admin.lng b/interface/web/admin/lib/lang/el_tpl_default-v2_admin.lng deleted file mode 100644 index 3e197606c..000000000 --- a/interface/web/admin/lib/lang/el_tpl_default-v2_admin.lng +++ /dev/null @@ -1,18 +0,0 @@ - diff --git a/interface/web/admin/lib/lang/en_tpl_default-v2_admin.lng b/interface/web/admin/lib/lang/en_tpl_default-v2_admin.lng deleted file mode 100644 index 3e197606c..000000000 --- a/interface/web/admin/lib/lang/en_tpl_default-v2_admin.lng +++ /dev/null @@ -1,18 +0,0 @@ - diff --git a/interface/web/admin/lib/lang/es_tpl_default-v2_admin.lng b/interface/web/admin/lib/lang/es_tpl_default-v2_admin.lng deleted file mode 100644 index 3e197606c..000000000 --- a/interface/web/admin/lib/lang/es_tpl_default-v2_admin.lng +++ /dev/null @@ -1,18 +0,0 @@ - diff --git a/interface/web/admin/lib/lang/fi_tpl_default-v2_admin.lng b/interface/web/admin/lib/lang/fi_tpl_default-v2_admin.lng deleted file mode 100644 index 3e197606c..000000000 --- a/interface/web/admin/lib/lang/fi_tpl_default-v2_admin.lng +++ /dev/null @@ -1,18 +0,0 @@ - diff --git a/interface/web/admin/lib/lang/fr_tpl_default-v2_admin.lng b/interface/web/admin/lib/lang/fr_tpl_default-v2_admin.lng deleted file mode 100644 index 3e197606c..000000000 --- a/interface/web/admin/lib/lang/fr_tpl_default-v2_admin.lng +++ /dev/null @@ -1,18 +0,0 @@ - diff --git a/interface/web/admin/lib/lang/hr_tpl_default-v2_admin.lng b/interface/web/admin/lib/lang/hr_tpl_default-v2_admin.lng deleted file mode 100644 index 3e197606c..000000000 --- a/interface/web/admin/lib/lang/hr_tpl_default-v2_admin.lng +++ /dev/null @@ -1,18 +0,0 @@ - diff --git a/interface/web/admin/lib/lang/hu_tpl_default-v2_admin.lng b/interface/web/admin/lib/lang/hu_tpl_default-v2_admin.lng deleted file mode 100644 index 3e197606c..000000000 --- a/interface/web/admin/lib/lang/hu_tpl_default-v2_admin.lng +++ /dev/null @@ -1,18 +0,0 @@ - diff --git a/interface/web/admin/lib/lang/id_tpl_default-v2_admin.lng b/interface/web/admin/lib/lang/id_tpl_default-v2_admin.lng deleted file mode 100644 index 3e197606c..000000000 --- a/interface/web/admin/lib/lang/id_tpl_default-v2_admin.lng +++ /dev/null @@ -1,18 +0,0 @@ - diff --git a/interface/web/admin/lib/lang/it_tpl_default-v2_admin.lng b/interface/web/admin/lib/lang/it_tpl_default-v2_admin.lng deleted file mode 100644 index 3e197606c..000000000 --- a/interface/web/admin/lib/lang/it_tpl_default-v2_admin.lng +++ /dev/null @@ -1,18 +0,0 @@ - diff --git a/interface/web/admin/lib/lang/ja_tpl_default-v2_admin.lng b/interface/web/admin/lib/lang/ja_tpl_default-v2_admin.lng deleted file mode 100644 index 3e197606c..000000000 --- a/interface/web/admin/lib/lang/ja_tpl_default-v2_admin.lng +++ /dev/null @@ -1,18 +0,0 @@ - diff --git a/interface/web/admin/lib/lang/nl_tpl_default-v2_admin.lng b/interface/web/admin/lib/lang/nl_tpl_default-v2_admin.lng deleted file mode 100644 index 3e197606c..000000000 --- a/interface/web/admin/lib/lang/nl_tpl_default-v2_admin.lng +++ /dev/null @@ -1,18 +0,0 @@ - diff --git a/interface/web/admin/lib/lang/pl_tpl_default-v2_admin.lng b/interface/web/admin/lib/lang/pl_tpl_default-v2_admin.lng deleted file mode 100644 index 3e197606c..000000000 --- a/interface/web/admin/lib/lang/pl_tpl_default-v2_admin.lng +++ /dev/null @@ -1,18 +0,0 @@ - diff --git a/interface/web/admin/lib/lang/pt_tpl_default-v2_admin.lng b/interface/web/admin/lib/lang/pt_tpl_default-v2_admin.lng deleted file mode 100644 index 3e197606c..000000000 --- a/interface/web/admin/lib/lang/pt_tpl_default-v2_admin.lng +++ /dev/null @@ -1,18 +0,0 @@ - diff --git a/interface/web/admin/lib/lang/ro_tpl_default-v2_admin.lng b/interface/web/admin/lib/lang/ro_tpl_default-v2_admin.lng deleted file mode 100644 index 3e197606c..000000000 --- a/interface/web/admin/lib/lang/ro_tpl_default-v2_admin.lng +++ /dev/null @@ -1,18 +0,0 @@ - diff --git a/interface/web/admin/lib/lang/ru_tpl_default-v2_admin.lng b/interface/web/admin/lib/lang/ru_tpl_default-v2_admin.lng deleted file mode 100644 index 3e197606c..000000000 --- a/interface/web/admin/lib/lang/ru_tpl_default-v2_admin.lng +++ /dev/null @@ -1,18 +0,0 @@ - diff --git a/interface/web/admin/lib/lang/se_tpl_default-v2_admin.lng b/interface/web/admin/lib/lang/se_tpl_default-v2_admin.lng deleted file mode 100644 index 3e197606c..000000000 --- a/interface/web/admin/lib/lang/se_tpl_default-v2_admin.lng +++ /dev/null @@ -1,18 +0,0 @@ - diff --git a/interface/web/admin/lib/lang/sk_tpl_default-v2_admin.lng b/interface/web/admin/lib/lang/sk_tpl_default-v2_admin.lng deleted file mode 100644 index 3e197606c..000000000 --- a/interface/web/admin/lib/lang/sk_tpl_default-v2_admin.lng +++ /dev/null @@ -1,18 +0,0 @@ - diff --git a/interface/web/admin/lib/lang/tr_tpl_default-v2_admin.lng b/interface/web/admin/lib/lang/tr_tpl_default-v2_admin.lng deleted file mode 100644 index 3e197606c..000000000 --- a/interface/web/admin/lib/lang/tr_tpl_default-v2_admin.lng +++ /dev/null @@ -1,18 +0,0 @@ - diff --git a/interface/web/admin/templates/tpl_default-v2_basic.htm b/interface/web/admin/templates/tpl_default-v2_basic.htm deleted file mode 100644 index 31f3eda05..000000000 --- a/interface/web/admin/templates/tpl_default-v2_basic.htm +++ /dev/null @@ -1,23 +0,0 @@ -

-

- -
- -
-
-
- - 152x46px -
-
- - - - -
- - -
-
- -
\ No newline at end of file diff --git a/interface/web/admin/tpl_default-v2.php b/interface/web/admin/tpl_default-v2.php deleted file mode 100644 index 39eb1c0e0..000000000 --- a/interface/web/admin/tpl_default-v2.php +++ /dev/null @@ -1,73 +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 onBeforeUpdate() { -// global $app, $conf; -// -// //* Check if the server has been changed -// // We do this only for the admin or reseller users, as normal clients can not change the server ID anyway -// if(($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) && isset($this->dataRecord["server_id"])) { -// $rec = $app->db->queryOneRecord("SELECT server_id from server_php WHERE server_php_id = ".$this->id); -// if($rec['server_id'] != $this->dataRecord["server_id"]) { -// //* Add a error message and switch back to old server -// $app->tform->errorMessage .= $app->lng('The Server can not be changed.'); -// $this->dataRecord["server_id"] = $rec['server_id']; -// } -// unset($rec); -// } -// } -} - -$page = new page_action; -$page->onLoad(); - -?> \ No newline at end of file diff --git a/interface/web/themes/default-304/templates/admin/tpl_default-v2_basic.htm b/interface/web/themes/default-304/templates/admin/tpl_default-v2_basic.htm deleted file mode 100644 index 31f3eda05..000000000 --- a/interface/web/themes/default-304/templates/admin/tpl_default-v2_basic.htm +++ /dev/null @@ -1,23 +0,0 @@ -

-

- -
- -
-
-
- - 152x46px -
-
- - - - -
- - -
-
- -
\ No newline at end of file diff --git a/interface/web/themes/default-304/templates/tools/tpl_default-v2.htm b/interface/web/themes/default-304/templates/tools/tpl_default-v2.htm deleted file mode 100644 index 330222ca2..000000000 --- a/interface/web/themes/default-304/templates/tools/tpl_default-v2.htm +++ /dev/null @@ -1,37 +0,0 @@ -

-

- -
- -
-
-
- - -
-
- - -
- -
- - -
-
- - - -
- - -
-
- -
\ No newline at end of file diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm index 4e222dd9a..e59a24fb5 100644 --- a/interface/web/themes/default/templates/main.tpl.htm +++ b/interface/web/themes/default/templates/main.tpl.htm @@ -5,20 +5,20 @@ " /> <tmpl_var name="app_title"> <tmpl_var name="app_version"> - - - - - - - + + + + + + + - +