[vhffs-dev] [828] moved <panel>phpmyadmin_url and <panel>phppgadmin_url to <mysql> url_phpmyadmin and <pgsql>url_phppgadmin, however they are not used yet

[subversion@xxxxxxxxx]

Revision: 828
Author:   gradator
Date:     2007-08-30 13:34:47 +0000 (Thu, 30 Aug 2007)

Log Message:
-----------
moved <panel>phpmyadmin_url and <panel>phppgadmin_url to <mysql>url_phpmyadmin and <pgsql>url_phppgadmin, however they are not used yet

Modified Paths:
--------------
    trunk/vhffs-api/src/Vhffs/Conf.pm
    trunk/vhffs-backend/conf/vhffs.conf.dist.in
    trunk/vhffs-tests/conf/vhffs.conf


Modified: trunk/vhffs-api/src/Vhffs/Conf.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Conf.pm	2007-08-30 13:26:56 UTC (rev 827)
+++ trunk/vhffs-api/src/Vhffs/Conf.pm	2007-08-30 13:34:47 UTC (rev 828)
@@ -502,19 +502,6 @@
 }
 
 
-sub get_panel_phppgadminurl
-{
-	if( $Config{"global"}{"panel"}{phppgadmin_url} )
-	{
-		return $Config{"global"}{"panel"}{phppgadmin_url};	
-	}
-	else
-	{
-		return undef;
-	}
-}
-
-
 sub get_panel_helpurl
 {
 	if( $Config{"global"}{"panel"}{help_url} )
@@ -528,18 +515,6 @@
 }
 
 
-sub get_panel_phpmyadminurl
-{
-	if( $Config{"global"}{"panel"}{phpmyadmin_url} )
-	{
-		return $Config{"global"}{"panel"}{phpmyadmin_url};	
-	}
-	else
-	{
-		return undef;
-	}
-}
-
 sub stats_on_home
 {
     if( defined $Config{"global"}{"panel"}{"stats_on_home"} )

Modified: trunk/vhffs-backend/conf/vhffs.conf.dist.in
===================================================================
--- trunk/vhffs-backend/conf/vhffs.conf.dist.in	2007-08-30 13:26:56 UTC (rev 827)
+++ trunk/vhffs-backend/conf/vhffs.conf.dist.in	2007-08-30 13:34:47 UTC (rev 828)
@@ -73,9 +73,6 @@
 		#This is the URL display for the "Help" link in the panel
 		help_url		=	http://help.hoster
 
-		phpmyadmin_url		=	http://phpmyadmin.hoster
-		phppgadmin_url		=	http://phppgadmin.hoster
-
 		#Is the panel open or not ?
 		open			=	yes
 
@@ -212,6 +209,9 @@
 		password	=	mysecret
 		mysqldump_path	=	/usr/bin/mysqldump
 
+		# URL to phpmyadmin
+		url_phpmyadmin	=	http://phpmyadmin.hoster
+
 		# URL to the documentation (optional)
 		url_doc		=	http://help.myhoster.net/mysql
 	</mysql>
@@ -225,6 +225,9 @@
 		password	=	mysecret
 		pgdump_path	=	/usr/bin/pg_dump
 
+		# URL to phppgadmin
+		url_phppgadmin	=	http://phppgadmin.hoster
+
 		# URL to the documentation (optional)
 		url_doc		=	http://help.myhoster.net/pgsql
 	</pgsql>

Modified: trunk/vhffs-tests/conf/vhffs.conf
===================================================================
--- trunk/vhffs-tests/conf/vhffs.conf	2007-08-30 13:26:56 UTC (rev 827)
+++ trunk/vhffs-tests/conf/vhffs.conf	2007-08-30 13:34:47 UTC (rev 828)
@@ -51,9 +51,6 @@
 		#This is the URL display for the "Help" link in the panel
 		help_url		=	http://help.hoster
 
-		phpmyadmin_url		=	http://phpmyadmin.hoster
-		phppgadmin_url		=	http://phppgadmin.hoster
-
 		#Is the panel open or not ?
 		open			= yes
 
@@ -180,6 +177,7 @@
 		host		= localhost
 		username	= root
 		password	= vhffs
+		url_phpmyadmin	=	http://phpmyadmin.vhffs.org
 	</mysql>
 
 	<pgsql>
@@ -187,6 +185,7 @@
 		host		= localhost
 		username	= vhffs
 		password	= zepojf
+		url_phppgadmin	=	http://phppgadmin.vhffs.org
 	</pgsql>
 
 	<svn>