From 4082c22f2898b50a9e5b9bba57d7c634867acdea Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Wed, 11 Jul 2012 11:29:52 +0300
Subject: [PATCH] added web statst link and nginx extention title

---
 web/templates/admin/list_db.html       | 4 +++-
 web/templates/admin/list_mail_acc.html | 2 +-
 web/templates/admin/list_web.html      | 8 +++++++-
 web/templates/user/list_mail_acc.html  | 2 +-
 web/templates/user/list_web.html       | 8 +++++++-
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/web/templates/admin/list_db.html b/web/templates/admin/list_db.html
index dea343f8..e96242d7 100644
--- a/web/templates/admin/list_db.html
+++ b/web/templates/admin/list_db.html
@@ -12,7 +12,9 @@ foreach ($data as $key => $value) {
     }
 
     list($http_host, $port) = split(':', $_SERVER["HTTP_HOST"]);
+    if ($data[$key]['TYPE'] == 'mysql') $db_admin = "phpMyAdmin";
     if ($data[$key]['TYPE'] == 'mysql') $db_admin_link = "http://".$http_host."/phpMyAdmin/";
+    if ($data[$key]['TYPE'] == 'pgsql') $db_admin = "phpPgAdmin";
     if ($data[$key]['TYPE'] == 'pgsql') $db_admin_link = "http://".$http_host."/phpPgAdmin/";
     ?>
 
@@ -68,7 +70,7 @@ foreach ($data as $key => $value) {
     <td class="data-dotted" width="830px" style="vertical-align:top;">
         <table width="830px"><tr>
             <td></td>
-            <td class="data-controls" width="120px"><img src="/images/new_window.png" width="8px" height="8px"> <a href="<?php echo $db_admin_link; ?>" target="_blank"> open web admin</a></td>
+            <td class="data-controls" width="126px"><img src="/images/new_window.png" width="8px" height="8px"> <a href="<?php echo $db_admin_link; ?>" target="_blank"> open <?php echo $db_admin ?> </a></td>
             <td class="data-controls" width="50px"><img src="/images/edit.png" width="8px" height="8px"><a href="/edit/db/?database=<?php echo $key ?>"> edit</a></td>
             <td class="data-controls" width="80px">
                 <img src="/images/suspend.png" width="7px" height="8px">
diff --git a/web/templates/admin/list_mail_acc.html b/web/templates/admin/list_mail_acc.html
index 789dc1c5..143c7190 100644
--- a/web/templates/admin/list_mail_acc.html
+++ b/web/templates/admin/list_mail_acc.html
@@ -81,7 +81,7 @@ foreach ($data as $key => $value) {
         </tr></table>
 
         <table class="data-col2" width="830px">
-            <tr><td colspan=3 class="domain" style="padding: 0 0 0 4px;"><b><?php echo $key ?></b> <a class="aliases" style="padding: 0 20px 0 4px"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a></td></tr>
+            <tr><td colspan=3 class="domain" style="padding: 0 0 0 4px;"><b><?php echo $key."@".$_GET['domain'] ?></b> <a class="aliases" style="padding: 0 20px 0 4px"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a></td></tr>
             <tr>
                 <td style="vertical-align:top;" >
                     <table>
diff --git a/web/templates/admin/list_web.html b/web/templates/admin/list_web.html
index 838b4c73..1fa5ec45 100644
--- a/web/templates/admin/list_web.html
+++ b/web/templates/admin/list_web.html
@@ -21,11 +21,13 @@ foreach ($data as $key => $value) {
         $ssl_home = '';
     }
     if (strlen($data[$key]['NGINX_EXT']) > 16 ) {
+        $nginx_ext_title = str_replace(',', ', ', $data[$key]['NGINX_EXT']);
         $nginx_ext = substr($data[$key]['NGINX_EXT'], 0, 16);
         $nginx_ext = trim($nginx_ext, ",");
         $nginx_ext = str_replace(',', ', ', $nginx_ext);
         $nginx_ext = $nginx_ext.", ...";
     } else {
+        $nginx_ext_title = '';
         $nginx_ext = str_replace(',', ', ', $data[$key]['NGINX_EXT']);
     }
 
@@ -83,6 +85,10 @@ foreach ($data as $key => $value) {
     <td class="data-dotted" width="830px" style="vertical-align:top;">
         <table width="830px"><tr>
             <td></td>
+            <?php if (!empty($data[$key]['STATS'])) {
+                echo '            <td class="data-controls" width="114px"><img src="/images/new_window.png" width="8px" height="8px">';
+                echo "<a href='http://".$key."/vstats/' target='_blank'> open webstats </a></td>";
+            } ?>
             <td class="data-controls" width="50px"><img src="/images/edit.png" width="8px" height="8px"><a href="/edit/web/?domain=<?php echo "$key" ?>"> edit</a></td>
             <td class="data-controls" width="80px">
                 <img src="/images/suspend.png" width="7px" height="8px">
@@ -127,7 +133,7 @@ foreach ($data as $key => $value) {
                         <tr><td class="counter-name" width="40%">SSL Support:</td><td class="counter-value"><?php echo $data[$key]['SSL'] ?></td></tr>
                         <tr><td class="counter-name">SSL Home:</td><td class="counter-value"><?php echo $ssl_home ?></td></tr>
                         <tr><td class="counter-name">Nginx Template:</td><td class="counter-value"><?php echo $data[$key]['NGINX'] ?></td></tr>
-                        <tr><td class="counter-name">Nginx Extentions:</td><td class="counter-value"><?php echo $nginx_ext ?></td></tr>
+                        <tr><td class="counter-name">Nginx Extentions:</td><td class="counter-value" <?php if (!empty($nginx_ext_title)) echo "title='".$nginx_ext_title."'" ?>><?php echo $nginx_ext ?></td></tr>
                     </table>
                 </td>
             </tr>
diff --git a/web/templates/user/list_mail_acc.html b/web/templates/user/list_mail_acc.html
index 793a2405..4f0092f9 100644
--- a/web/templates/user/list_mail_acc.html
+++ b/web/templates/user/list_mail_acc.html
@@ -56,7 +56,7 @@ foreach ($data as $key => $value) {
         </tr></table>
 
         <table class="data-col2" width="830px">
-            <tr><td colspan=3 class="domain" style="padding: 0 0 0 4px;"><b><?php echo $key ?></b> <a class="aliases" style="padding: 0 20px 0 4px"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a></td></tr>
+            <tr><td colspan=3 class="domain" style="padding: 0 0 0 4px;"><b><?php echo $key."@".$_GET['domain'] ?></b> <a class="aliases" style="padding: 0 20px 0 4px"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a></td></tr>
             <tr>
                 <td style="vertical-align:top;" >
                     <table>
diff --git a/web/templates/user/list_web.html b/web/templates/user/list_web.html
index e4070711..87398550 100644
--- a/web/templates/user/list_web.html
+++ b/web/templates/user/list_web.html
@@ -21,11 +21,13 @@ foreach ($data as $key => $value) {
         $ssl_home = '';
     }
     if (strlen($data[$key]['NGINX_EXT']) > 16 ) {
+        $nginx_ext_title = str_replace(',', ', ', $data[$key]['NGINX_EXT']);
         $nginx_ext = substr($data[$key]['NGINX_EXT'], 0, 16);
         $nginx_ext = trim($nginx_ext, ",");
         $nginx_ext = str_replace(',', ', ', $nginx_ext);
         $nginx_ext = $nginx_ext.", ...";
     } else {
+        $nginx_ext_title = '';
         $nginx_ext = str_replace(',', ', ', $data[$key]['NGINX_EXT']);
     }
 
@@ -65,6 +67,10 @@ foreach ($data as $key => $value) {
     <td class="data-dotted" width="830px" style="vertical-align:top;">
         <table width="830px"><tr>
             <td></td>
+            <?php if (!empty($data[$key]['STATS'])) {
+                echo '            <td class="data-controls" width="114px"><img src="/images/new_window.png" width="8px" height="8px">';
+                echo "<a href='http://".$key."/vstats/' target='_blank'> open webstats </a></td>";
+            } ?>
             <td class="data-controls" width="50px"><img src="/images/edit.png" width="8px" height="8px"><a href="/edit/web/?domain=<?php echo "$key" ?>"> edit</a></td>
             <td class="data-controls" width="70px">
                 <img src="/images/delete.png" width="7px" height="7px">
@@ -102,7 +108,7 @@ foreach ($data as $key => $value) {
                         <tr><td class="counter-name" width="40%">SSL Support:</td><td class="counter-value"><?php echo $data[$key]['SSL'] ?></td></tr>
                         <tr><td class="counter-name">SSL Home:</td><td class="counter-value"><?php echo $ssl_home ?></td></tr>
                         <tr><td class="counter-name">Nginx Template:</td><td class="counter-value"><?php echo $data[$key]['NGINX'] ?></td></tr>
-                        <tr><td class="counter-name">Nginx Extentions:</td><td class="counter-value"><?php echo $nginx_ext ?></td></tr>
+                        <tr><td class="counter-name">Nginx Extentions:</td><td class="counter-value" <?php if (!empty($nginx_ext_title)) echo "title='".$nginx_ext_title."'" ?>><?php echo $nginx_ext ?></td></tr>
                     </table>
                 </td>
             </tr>