Challenging routing on render_page

Flatta · Flatta · commit 37fb30494234 · 2016-07-02T21:40:46.000+09:00
diff --git a/web/add/cron/index.php b/web/add/cron/index.php
@@ -62,7 +62,7 @@
 }
 
 // Render
-render_page($user, $TAB, 'admin/add_cron');
+render_page($user, $TAB, 'add_cron');
 
 // Flush session messages
 unset($_SESSION['error_msg']);
diff --git a/web/add/db/index.php b/web/add/db/index.php
@@ -121,7 +121,7 @@
 unset($db_hosts_tmp);
 unset($output);
 
-render_page($user, $TAB, 'admin/add_db');
+render_page($user, $TAB, 'add_db');
 
 // Flush session messages
 unset($_SESSION['error_msg']);
diff --git a/web/add/dns/index.php b/web/add/dns/index.php
@@ -166,12 +166,12 @@
         unset($output);
     }
 
-    render_page($user, $TAB, 'admin/add_dns');
+    render_page($user, $TAB, 'add_dns');
 } else {
     // Display body for dns record
 
     $v_domain = $_GET['domain'];
-    render_page($user, $TAB, 'admin/add_dns_rec');
+    render_page($user, $TAB, 'add_dns_rec');
 }
 
 
diff --git a/web/add/firewall/banlist/index.php b/web/add/firewall/banlist/index.php
@@ -48,7 +48,7 @@
 }
 
 // Render
-render_page($user, $TAB, 'admin/add_firewall_banlist');
+render_page($user, $TAB, 'add_firewall_banlist');
 
 // Flush session messages
 unset($_SESSION['error_msg']);
diff --git a/web/add/firewall/index.php b/web/add/firewall/index.php
@@ -64,7 +64,7 @@
 }
 
 // Render
-render_page($user, $TAB, 'admin/add_firewall');
+render_page($user, $TAB, 'add_firewall');
 
 // Flush session messages
 unset($_SESSION['error_msg']);
diff --git a/web/add/ip/index.php b/web/add/ip/index.php
@@ -85,7 +85,7 @@
 unset($output);
 
 // Render
-render_page($user, $TAB, 'admin/add_ip');
+render_page($user, $TAB, 'add_ip');
 
 // Flush session messages
 unset($_SESSION['error_msg']);
diff --git a/web/add/mail/index.php b/web/add/mail/index.php
@@ -182,12 +182,12 @@
 if (empty($_GET['domain'])) {
     // Display body for mail domain
 
-    render_page($user, $TAB, 'admin/add_mail');
+    render_page($user, $TAB, 'add_mail');
 } else {
     // Display body for mail account
 
     $v_domain = $_GET['domain'];
-    render_page($user, $TAB, 'admin/add_mail_acc');
+    render_page($user, $TAB, 'add_mail_acc');
 }
 
 // Flush session messages
diff --git a/web/add/package/index.php b/web/add/package/index.php
@@ -202,7 +202,7 @@
 if (empty($v_ns2)) $v_ns2 = 'ns2.example.ltd';
 
 // Render page
-render_page($user, $TAB, 'admin/add_package');
+render_page($user, $TAB, 'add_package');
 
 // Flush session messages
 unset($_SESSION['error_msg']);
diff --git a/web/add/user/index.php b/web/add/user/index.php
@@ -122,7 +122,7 @@
 unset($output);
 
 // Render page
-render_page($user, $TAB, 'admin/add_user');
+render_page($user, $TAB, 'add_user');
 
 // Flush session messages
 unset($_SESSION['error_msg']);
diff --git a/web/add/web/index.php b/web/add/web/index.php
@@ -347,7 +347,7 @@
 unset($output);
 
 // Render page
-render_page($user, $TAB, 'admin/add_web');
+render_page($user, $TAB, 'add_web');
 
 // Flush session messages
 unset($_SESSION['error_msg']);
diff --git a/web/edit/backup/exclusions/index.php b/web/edit/backup/exclusions/index.php
@@ -123,7 +123,7 @@
 
 
 // Render page
-render_page($user, $TAB, 'admin/edit_backup_exclusions');
+render_page($user, $TAB, 'edit_backup_exclusions');
 
 // Flush session messages
 unset($_SESSION['error_msg']);
diff --git a/web/edit/cron/index.php b/web/edit/cron/index.php
@@ -76,7 +76,7 @@
 }
 
 // Render page
-render_page($user, $TAB, 'admin/edit_cron');
+render_page($user, $TAB, 'edit_cron');
 
 // Flush session messages
 unset($_SESSION['error_msg']);
diff --git a/web/edit/db/index.php b/web/edit/db/index.php
@@ -82,7 +82,7 @@
 }
 
 // Render page
-render_page($user, $TAB, 'admin/edit_db');
+render_page($user, $TAB, 'edit_db');
 
 // Flush session messages
 unset($_SESSION['error_msg']);
diff --git a/web/edit/dns/index.php b/web/edit/dns/index.php
@@ -198,10 +198,10 @@
 // Render page
 if (empty($_GET['record_id']))  {
     // Display body for dns domain
-    render_page($user, $TAB, '*/edit_dns');
+    render_page($user, $TAB, 'edit_dns');
 } else {
     // Display body for dns record
-    render_page($user, $TAB, 'admin/edit_dns_rec');
+    render_page($user, $TAB, 'edit_dns_rec');
 }
 
 // Flush session messages
diff --git a/web/edit/firewall/index.php b/web/edit/firewall/index.php
@@ -81,7 +81,7 @@
 }
 
 // Render page
-render_page($user, $TAB, 'admin/edit_firewall');
+render_page($user, $TAB, 'edit_firewall');
 
 // Flush session messages
 unset($_SESSION['error_msg']);
diff --git a/web/edit/ip/index.php b/web/edit/ip/index.php
@@ -99,7 +99,7 @@
 }
 
 // Render page
-render_page($user, $TAB, 'admin/edit_ip');
+render_page($user, $TAB, 'edit_ip');
 
 // Flush session messages
 unset($_SESSION['error_msg']);
diff --git a/web/edit/mail/index.php b/web/edit/mail/index.php
@@ -307,10 +307,10 @@
 // Render page
 if (empty($_GET['account']))  {
     // Display body for mail domain
-    render_page($user, $TAB, 'admin/edit_mail');
+    render_page($user, $TAB, 'edit_mail');
 } else {
     // Display body for mail account
-    render_page($user, $TAB, 'admin/edit_mail_acc');
+    render_page($user, $TAB, 'edit_mail_acc');
 }
 
 // Flush session messages
diff --git a/web/edit/package/index.php b/web/edit/package/index.php
@@ -224,7 +224,7 @@
 
 
 // Render page
-render_page($user, $TAB, 'admin/edit_package');
+render_page($user, $TAB, 'edit_package');
 
 // Flush session messages
 unset($_SESSION['error_msg']);
diff --git a/web/edit/server/index.php b/web/edit/server/index.php
@@ -422,7 +422,7 @@
 }
 
 // Render page
-render_page($user, $TAB, 'admin/edit_server');
+render_page($user, $TAB, 'edit_server');
 
 // Flush session messages
 unset($_SESSION['error_msg']);
diff --git a/web/edit/user/index.php b/web/edit/user/index.php
@@ -183,13 +183,8 @@
     }
 }
 
-
 // Render page
-if ($_SESSION['user'] == 'admin') {
-    render_page($user, $TAB, 'admin/edit_user');
-} else {
-    render_page($user, $TAB, 'user/edit_user');
-}
+render_page($user, $TAB, 'edit_user');
 
 // Flush session messages
 unset($_SESSION['error_msg']);
diff --git a/web/edit/web/index.php b/web/edit/web/index.php
@@ -694,7 +694,7 @@
 }
 
 // Render page
-render_page($user, $TAB, '*/edit_web');
+render_page($user, $TAB, 'edit_web');
 
 // Flush session messages
 unset($_SESSION['error_msg']);
diff --git a/web/generate/ssl/index.php b/web/generate/ssl/index.php
@@ -23,7 +23,7 @@
 
 // Check POST
 if (!isset($_POST['generate'])) {
-    render_page($user, $TAB, 'admin/generate_ssl');
+    render_page($user, $TAB, 'generate_ssl');
     exit;
 }
 
@@ -51,7 +51,7 @@
         }
     }
     $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
-    render_page($user, $TAB, 'admin/generate_ssl');
+    render_page($user, $TAB, 'generate_ssl');
     unset($_SESSION['error_msg']);
     exit;
 }
@@ -79,7 +79,7 @@
     $error = implode('<br>', $output);
     if (empty($error)) $error = __('Error code:',$return_var);
     $_SESSION['error_msg'] = $error;
-    render_page($user, $TAB, 'admin/generate_ssl');
+    render_page($user, $TAB, 'generate_ssl');
     unset($_SESSION['error_msg']);
     exit;
 }
@@ -98,6 +98,6 @@
 $_SESSION['back'] = $_SERVER['REQUEST_URI'];
 
 // Render page
-render_page($user, $TAB, 'admin/list_ssl');
+render_page($user, $TAB, 'list_ssl');
 
 unset($_SESSION['ok_msg']);
diff --git a/web/inc/main.php b/web/inc/main.php
@@ -97,7 +97,6 @@ function check_return_code($return_var,$output) {
 
 function render_page($user, $TAB, $page) {
     $__template_dir = dirname(__DIR__) . '/templates/';
-    $__template_base = $__template_dir . str_replace('*', $_SESSION['user'] === 'admin' ? 'admin' : 'user', $page);
 
     // Header
     include($__template_dir . 'header.html');
@@ -115,7 +114,16 @@ function render_page($user, $TAB, $page) {
     //*/
 
     // Body
-    @include($__template_base . '.html');
+    if (($_SESSION['user'] !== 'admin') && (@include($__template_dir . "user/$page.html"))) {
+        // User page exists
+        // Use user page
+        $__template_base = $__template_dir . "user/$page";
+    } else {
+        // Not admin or user page doesn't exist
+        // Use admin page
+        $__template_base = $__template_dir . "admin/$page";
+        include($__template_base . '.html');
+    }
 
     // Footer
     $JS_FILE = $__template_base . '.js.html';
diff --git a/web/list/backup/exclusions/index.php b/web/list/backup/exclusions/index.php
@@ -11,7 +11,7 @@
 unset($output);
 
 // Render page
-render_page($user, $TAB, 'admin/list_backup_exclusions');
+render_page($user, $TAB, 'list_backup_exclusions');
 
 // Back uri
 $_SESSION['back'] = $_SERVER['REQUEST_URI'];
diff --git a/web/list/backup/index.php b/web/list/backup/index.php
@@ -12,14 +12,14 @@
     $data = array_reverse($data,true);
     unset($output);
 
-    render_page($user, $TAB, 'admin/list_backup');
+    render_page($user, $TAB, 'list_backup');
 } else {
     exec (VESTA_CMD."v-list-user-backup $user ".escapeshellarg($_GET['backup'])." json", $output, $return_var);
     $data = json_decode(implode('', $output), true);
     $data = array_reverse($data,true);
     unset($output);
 
-    render_page($user, $TAB, 'admin/list_backup_detail');
+    render_page($user, $TAB, 'list_backup_detail');
 }
 
 // Back uri
diff --git a/web/list/cron/index.php b/web/list/cron/index.php
@@ -12,7 +12,7 @@
 unset($output);
 
 // Render page
-render_page($user, $TAB, '*/list_cron');
+render_page($user, $TAB, 'list_cron');
 
 // Back uri
 $_SESSION['back'] = $_SERVER['REQUEST_URI'];
diff --git a/web/list/db/index.php b/web/list/db/index.php
@@ -12,7 +12,7 @@
 unset($output);
 
 // Render page
-render_page($user, $TAB, '*/list_db');
+render_page($user, $TAB, 'list_db');
 
 // Back uri
 $_SESSION['back'] = $_SERVER['REQUEST_URI'];
diff --git a/web/list/dns/index.php b/web/list/dns/index.php
@@ -12,14 +12,14 @@
     $data = array_reverse($data, true);
     unset($output);
 
-    render_page($user, $TAB, '*/list_dns');
+    render_page($user, $TAB, 'list_dns');
 } else {
     exec (VESTA_CMD."v-list-dns-records '".$user."' '".escapeshellarg($_GET['domain'])."' 'json'", $output, $return_var);
     $data = json_decode(implode('', $output), true);
     $data = array_reverse($data, true);
     unset($output);
 
-    render_page($user, $TAB, '*/list_dns_rec');
+    render_page($user, $TAB, 'list_dns_rec');
 }
 
 // Back uri
diff --git a/web/list/firewall/banlist/index.php b/web/list/firewall/banlist/index.php
@@ -18,7 +18,7 @@
 unset($output);
 
 // Render page
-render_page($user, $TAB, 'admin/list_firewall_banlist');
+render_page($user, $TAB, 'list_firewall_banlist');
 
 // Back uri
 $_SESSION['back'] = $_SERVER['REQUEST_URI'];
diff --git a/web/list/firewall/index.php b/web/list/firewall/index.php
@@ -18,7 +18,7 @@
 unset($output);
 
 // Render page
-render_page($user, $TAB, 'admin/list_firewall');
+render_page($user, $TAB, 'list_firewall');
 
 // Back uri
 $_SESSION['back'] = $_SERVER['REQUEST_URI'];
diff --git a/web/list/ip/index.php b/web/list/ip/index.php
@@ -19,7 +19,7 @@
 unset($output);
 
 // Render page
-render_page($user, $TAB, 'admin/list_ip');
+render_page($user, $TAB, 'list_ip');
 
 // Back uri
 $_SESSION['back'] = $_SERVER['REQUEST_URI'];
diff --git a/web/list/log/index.php b/web/list/log/index.php
@@ -13,4 +13,4 @@
 unset($output);
 
 // Render page
-render_page($user, $TAB, 'admin/list_log');
+render_page($user, $TAB, 'list_log');
diff --git a/web/list/mail/index.php b/web/list/mail/index.php
@@ -12,14 +12,14 @@
     $data = array_reverse($data, true);
     unset($output);
 
-    render_page($user, $TAB, '*/list_mail');
+    render_page($user, $TAB, 'list_mail');
 } else {
     exec (VESTA_CMD."v-list-mail-accounts '".$user."' '".escapeshellarg($_GET['domain'])."' json", $output, $return_var);
     $data = json_decode(implode('', $output), true);
     $data = array_reverse($data, true);
     unset($output);
 
-    render_page($user, $TAB, '*/list_mail_acc');
+    render_page($user, $TAB, 'list_mail_acc');
 }
 
 // Back uri
diff --git a/web/list/notifications/index.php b/web/list/notifications/index.php
@@ -28,7 +28,7 @@
 $data = array_reverse($data,true);
 
 // Render page
-render_page($user, $TAB, '*/list_notifications');
+render_page($user, $TAB, 'list_notifications');
 
 // Back uri
 $_SESSION['back'] = $_SERVER['REQUEST_URI'];
diff --git a/web/list/package/index.php b/web/list/package/index.php
diff --git a/web/list/rrd/index.php b/web/list/rrd/index.php
diff --git a/web/list/server/index.php b/web/list/server/index.php
diff --git a/web/list/stats/index.php b/web/list/stats/index.php
diff --git a/web/list/updates/index.php b/web/list/updates/index.php
diff --git a/web/list/user/index.php b/web/list/user/index.php
diff --git a/web/list/web/index.php b/web/list/web/index.php
diff --git a/web/search/index.php b/web/search/index.php

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`// Render`
`65`		`-render_page($user, $TAB, 'admin/add_cron');`
	`65`	`+render_page($user, $TAB, 'add_cron');`
`66`	`66`
`67`	`67`	`// Flush session messages`
`68`	`68`	`unset($_SESSION['error_msg']);`
Original file line number	Diff line number	Diff line change
`@@ -166,12 +166,12 @@`
`166`	`166`	`unset($output);`
`167`	`167`	`}`
`168`	`168`
`169`		`- render_page($user, $TAB, 'admin/add_dns');`
	`169`	`+ render_page($user, $TAB, 'add_dns');`
`170`	`170`	`} else {`
`171`	`171`	`// Display body for dns record`
`172`	`172`
`173`	`173`	`$v_domain = $_GET['domain'];`
`174`		`- render_page($user, $TAB, 'admin/add_dns_rec');`
	`174`	`+ render_page($user, $TAB, 'add_dns_rec');`
`175`	`175`	`}`
`176`	`176`
`177`	`177`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`// Render`
`51`		`-render_page($user, $TAB, 'admin/add_firewall_banlist');`
	`51`	`+render_page($user, $TAB, 'add_firewall_banlist');`
`52`	`52`
`53`	`53`	`// Flush session messages`
`54`	`54`	`unset($_SESSION['error_msg']);`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`// Render`
`67`		`-render_page($user, $TAB, 'admin/add_firewall');`
	`67`	`+render_page($user, $TAB, 'add_firewall');`
`68`	`68`
`69`	`69`	`// Flush session messages`
`70`	`70`	`unset($_SESSION['error_msg']);`