github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-22 14:24:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 465fbb7aa3 into c66727453c

Browse source
This commit is contained in:
Jeroen Derks 2013-04-06 19:46:01 -07:00
commit 002ffe0210
7 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bin/v-add-database
View file

@ -48,8 +48,8 @@ is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user"
is_object_new 'db' 'DB' "$database" is_object_new 'db' 'DB' "$database"
get_next_dbhost get_next_dbhost
is_object_valid "../../../conf/$type" 'HOST' "$host" is_object_valid "../../../conf/$type" 'DBHOST' "$host"
is_object_unsuspended "../../../conf/$type" 'HOST' "$host" is_object_unsuspended "../../../conf/$type" 'DBHOST' "$host"
#is_charset_valid #is_charset_valid
is_package_full 'DATABASES' is_package_full 'DATABASES'

4
web/templates/admin/list_db.html
View file

@ -43,9 +43,9 @@
} }
if ($data[$key]['HOST'] != 'localhost' ) $http_host = $data[$key]['HOST']; if ($data[$key]['HOST'] != 'localhost' ) $http_host = $data[$key]['HOST'];
if ($data[$key]['TYPE'] == 'mysql') $db_admin = "phpMyAdmin"; if ($data[$key]['TYPE'] == 'mysql') $db_admin = "phpMyAdmin";
if ($data[$key]['TYPE'] == 'mysql') $db_admin_link = "http://".$http_host."/phpMyAdmin/"; if ($data[$key]['TYPE'] == 'mysql') $db_admin_link = "https://".$http_host."/phpMyAdmin/";
if ($data[$key]['TYPE'] == 'pgsql') $db_admin = "phpPgAdmin"; if ($data[$key]['TYPE'] == 'pgsql') $db_admin = "phpPgAdmin";
if ($data[$key]['TYPE'] == 'pgsql') $db_admin_link = "http://".$http_host."/phpPgAdmin/"; if ($data[$key]['TYPE'] == 'pgsql') $db_admin_link = "https://".$http_host."/phpPgAdmin/";
?> ?>
<tr class="data-row"> <tr class="data-row">
<td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150"> <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">

2
web/templates/admin/list_mail.html
View file

@ -79,7 +79,7 @@
<?php print _('edit');?> <?php print _('edit');?>
</span> </span>
</a> </a>
<a href="<?php echo "http://".$http_host."/webmail/"; ?>" target="_blank" class="data-controls"> <a href="<?php echo "https://".$http_host."/webmail/"; ?>" target="_blank" class="data-controls">
<span> <span>
<img src="/images/new_window.png" width="8px" height="8px"> <img src="/images/new_window.png" width="8px" height="8px">
<?php print _('open webmail');?> <?php print _('open webmail');?>

2
web/templates/admin/list_web.html
View file

@ -110,7 +110,7 @@
<?php <?php
if (!empty($data[$key]['STATS'])) { if (!empty($data[$key]['STATS'])) {
?> ?>
<a href="http://<?php echo $key ?>/vstats/" target="_blank" class="data-controls"> <a href="https://<?php echo $key ?>/vstats/" target="_blank" class="data-controls">
<span> <span>
<img src="/images/new_window.png" width="8px" height="8px"> <img src="/images/new_window.png" width="8px" height="8px">
<?php print _('open webstats');?> <?php print _('open webstats');?>

4
web/templates/user/list_db.html
View file

@ -41,9 +41,9 @@
} }
if ($data[$key]['HOST'] != 'localhost' ) $http_host = $data[$key]['HOST']; if ($data[$key]['HOST'] != 'localhost' ) $http_host = $data[$key]['HOST'];
if ($data[$key]['TYPE'] == 'mysql') $db_admin = "phpMyAdmin"; if ($data[$key]['TYPE'] == 'mysql') $db_admin = "phpMyAdmin";
if ($data[$key]['TYPE'] == 'mysql') $db_admin_link = "http://".$http_host."/phpMyAdmin/"; if ($data[$key]['TYPE'] == 'mysql') $db_admin_link = "https://".$http_host."/phpMyAdmin/";
if ($data[$key]['TYPE'] == 'pgsql') $db_admin = "phpPgAdmin"; if ($data[$key]['TYPE'] == 'pgsql') $db_admin = "phpPgAdmin";
if ($data[$key]['TYPE'] == 'pgsql') $db_admin_link = "http://".$http_host."/phpPgAdmin/"; if ($data[$key]['TYPE'] == 'pgsql') $db_admin_link = "https://".$http_host."/phpPgAdmin/";
?> ?>
<tr class="data-row"> <tr class="data-row">
<td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150"> <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">

2
web/templates/user/list_mail.html
View file

@ -68,7 +68,7 @@
<?php print _('edit');?> <?php print _('edit');?>
</span> </span>
</a> </a>
<a href="<?php echo "http://".$http_host."/webmail/"; ?>" target="_blank" class="data-controls"> <a href="<?php echo "https://".$http_host."/webmail/"; ?>" target="_blank" class="data-controls">
<span> <span>
<img src="/images/new_window.png" width="8px" height="8px"> <img src="/images/new_window.png" width="8px" height="8px">
<?php print _('open webmail');?> <?php print _('open webmail');?>

2
web/templates/user/list_web.html
View file

@ -99,7 +99,7 @@
<?php <?php
if (!empty($data[$key]['STATS'])) { if (!empty($data[$key]['STATS'])) {
?> ?>
<a href="http://<?php echo $key ?>/vstats/" target="_blank" class="data-controls"> <a href="https://<?php echo $key ?>/vstats/" target="_blank" class="data-controls">
<span> <span>
<img src="/images/new_window.png" width="8px" height="8px"> <img src="/images/new_window.png" width="8px" height="8px">
<?php print _('open webstats');?> <?php print _('open webstats');?>