From c5e87866700b0aee5a1bf5ee12ab4e7e43707cb7 Mon Sep 17 00:00:00 2001 From: "Florian Aders (EleRas)" Date: Mon, 13 Jun 2011 17:57:17 +0200 Subject: [PATCH] Implemented linker - class for admin_admins.php Signed-off-by: Florian Aders (EleRas) --- lib/classes/output/class.linker.php | 10 +++++++--- templates/Classic/admin/admins/admins.tpl | 4 ++-- templates/Classic/admin/admins/admins_add.tpl | 2 +- templates/Classic/admin/admins/admins_admin.tpl | 4 ++-- templates/Classic/admin/admins/admins_edit.tpl | 2 +- templates/Froxlor/admin/admins/admins.tpl | 8 ++++---- templates/Froxlor/admin/admins/admins_add.tpl | 2 +- templates/Froxlor/admin/admins/admins_admin.tpl | 6 +++--- templates/Froxlor/admin/admins/admins_edit.tpl | 2 +- 9 files changed, 22 insertions(+), 18 deletions(-) diff --git a/lib/classes/output/class.linker.php b/lib/classes/output/class.linker.php index b87a6332..d34aa311 100644 --- a/lib/classes/output/class.linker.php +++ b/lib/classes/output/class.linker.php @@ -35,6 +35,7 @@ class linker $this->hostname = $hostname; $this->port = $port; $this->filename = $file; + # @TODO: Remove this $this->args['s'] = $sessionid; } @@ -72,6 +73,7 @@ class linker { # Just resetting the array # Until the sessionid can be removed: save it + # @TODO: Remove this $this->args = array('s' => $this->args['s']); } @@ -122,10 +124,12 @@ class linker } # temporary until frontcontroller exists - # We got a section in the URL -> add area and section as filename + # We got a section in the URL -> morph AREA and section into filename + # @TODO: Remove this if (isset($this->args['section'])) { $link .= AREA . '_' . $this->args['section'] . '.php'; + unset($this->args['section']); } else { @@ -144,10 +148,10 @@ class linker # Loop through arguments and add them to the link foreach ($this->args as $key => $value) { - # For all but the first argument, prepend "&" + # For all but the first argument, prepend "&" if (substr($link, -1) != "?") { - $link .= "&"; + $link .= "&"; } # Encode parameters and add them to the link diff --git a/templates/Classic/admin/admins/admins.tpl b/templates/Classic/admin/admins/admins.tpl index 58edf4a9..48449c00 100644 --- a/templates/Classic/admin/admins/admins.tpl +++ b/templates/Classic/admin/admins/admins.tpl @@ -1,5 +1,5 @@ $header -
+ @@ -36,7 +36,7 @@ $header - +
{$lng['admin']['admin_add']}{$lng['admin']['admin_add']}
diff --git a/templates/Classic/admin/admins/admins_add.tpl b/templates/Classic/admin/admins/admins_add.tpl index 540ea66d..14ba176b 100644 --- a/templates/Classic/admin/admins/admins_add.tpl +++ b/templates/Classic/admin/admins/admins_add.tpl @@ -1,5 +1,5 @@ $header -
+ diff --git a/templates/Classic/admin/admins/admins_admin.tpl b/templates/Classic/admin/admins/admins_admin.tpl index 6a693ffa..cd86acd8 100644 --- a/templates/Classic/admin/admins/admins_admin.tpl +++ b/templates/Classic/admin/admins/admins_admin.tpl @@ -1,5 +1,5 @@ - {$row['loginname']}{$row['loginname']} + {$row['loginname']}{$row['loginname']} {$row['name']} {$row['customers_used']}/{$row['customers']}
{$row['domains_used']}/{$row['domains']} {$row['diskspace_used']}/{$row['diskspace']} (MB)
{$row['traffic_used']}/{$row['traffic']} (GB) @@ -22,5 +22,5 @@ {$row['emails_used']}/{$row['emails']}
{$row['subdomains_used']}/{$row['subdomains']} {$row['email_accounts_used']}/{$row['email_accounts']}
{$row['email_forwarders_used']}/{$row['email_forwarders']} {$lng['panel']['yes']}{$lng['panel']['no']} - {$lng['panel']['edit']}
{$lng['panel']['delete']} + {$lng['panel']['edit']}
{$lng['panel']['delete']} diff --git a/templates/Classic/admin/admins/admins_edit.tpl b/templates/Classic/admin/admins/admins_edit.tpl index 9530a155..0b79c226 100644 --- a/templates/Classic/admin/admins/admins_edit.tpl +++ b/templates/Classic/admin/admins/admins_edit.tpl @@ -1,5 +1,5 @@ $header - + diff --git a/templates/Froxlor/admin/admins/admins.tpl b/templates/Froxlor/admin/admins/admins.tpl index 20d9edab..0a037b79 100644 --- a/templates/Froxlor/admin/admins/admins.tpl +++ b/templates/Froxlor/admin/admins/admins.tpl @@ -9,7 +9,7 @@ $header
- +
{$searchcode} @@ -18,7 +18,7 @@ $header
  - {$lng['admin']['admin_add']} + {$lng['admin']['admin_add']}
@@ -32,7 +32,7 @@ $header {$lng['panel']['options']} - + {$pagingcode} @@ -53,7 +53,7 @@ $header
  - {$lng['admin']['admin_add']} + {$lng['admin']['admin_add']}
diff --git a/templates/Froxlor/admin/admins/admins_add.tpl b/templates/Froxlor/admin/admins/admins_add.tpl index 09cc5650..4d6ebc59 100644 --- a/templates/Froxlor/admin/admins/admins_add.tpl +++ b/templates/Froxlor/admin/admins/admins_add.tpl @@ -9,7 +9,7 @@ $header
- +
Froxlor - {$title} diff --git a/templates/Froxlor/admin/admins/admins_admin.tpl b/templates/Froxlor/admin/admins/admins_admin.tpl index 67759bfe..67f1636b 100644 --- a/templates/Froxlor/admin/admins/admins_admin.tpl +++ b/templates/Froxlor/admin/admins/admins_admin.tpl @@ -3,7 +3,7 @@ {$row['name']} -  ({$row['loginname']}) +  ({$row['loginname']})  ({$row['loginname']}) @@ -50,10 +50,10 @@ - + {$lng['panel']['edit']}   - + {$lng['panel']['delete']} diff --git a/templates/Froxlor/admin/admins/admins_edit.tpl b/templates/Froxlor/admin/admins/admins_edit.tpl index 9188fcb0..25c498bc 100644 --- a/templates/Froxlor/admin/admins/admins_edit.tpl +++ b/templates/Froxlor/admin/admins/admins_edit.tpl @@ -15,7 +15,7 @@ $header
- +
Froxlor - {$title}