[evolvis-commits] r15282: Config API: mantis plugin

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Feb 28 23:53:11 CET 2011


Author: mirabilos
Date: 2011-02-28 23:53:11 +0100 (Mon, 28 Feb 2011)
New Revision: 15282

Added:
   trunk/gforge_base/evolvisforge-5.1/gforge/plugins/mantis/etc/plugins/mantis/config.ini
Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/common/include/config-vars.php
   trunk/gforge_base/evolvisforge-5.1/gforge/plugins/mantis/include/MantisPlugin.class.php
   trunk/gforge_base/evolvisforge-5.1/gforge/plugins/mantis/www/index.php
   trunk/gforge_base/evolvisforge-5.1/gforge/utils/migrate-to-ini-files.sh
Log:
Config API: mantis plugin

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/include/config-vars.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/include/config-vars.php	2011-02-28 22:53:08 UTC (rev 15281)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/include/config-vars.php	2011-02-28 22:53:11 UTC (rev 15282)
@@ -263,6 +263,16 @@
 	forge_define_config_item ('templates', 'blocks', json_encode($plugins_blocks_templates)) ;
 }
 
+// Mantis plugin
+if (file_exists ($gfconfig.'plugins/mantis/config.php')) {
+	require_once $gfconfig.'plugins/mantis/config.php' ;
+	
+	forge_define_config_item ('server', 'mantis', $serveur_mantis) ;
+	forge_define_config_item ('db_host', 'mantis', $mantis_db_host) ;
+	forge_define_config_item ('db_user', 'mantis', $mantis_db_user) ;
+	forge_define_config_item ('db_passwd', 'mantis', $mantis_db_passwd) ;
+}
+
 // forge_define_config_item ('', 'core', $GLOBALS['sys_']) ;
 
 /* Long-term:

Added: trunk/gforge_base/evolvisforge-5.1/gforge/plugins/mantis/etc/plugins/mantis/config.ini
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/plugins/mantis/etc/plugins/mantis/config.ini	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/plugins/mantis/etc/plugins/mantis/config.ini	2011-02-28 22:53:11 UTC (rev 15282)
@@ -0,0 +1,6 @@
+[mantis]
+
+server = Mantis
+db_host = localhost
+db_user = GForge
+db_passwd = secret

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/plugins/mantis/include/MantisPlugin.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/plugins/mantis/include/MantisPlugin.class.php	2011-02-28 22:53:08 UTC (rev 15281)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/plugins/mantis/include/MantisPlugin.class.php	2011-02-28 22:53:11 UTC (rev 15282)
@@ -21,6 +21,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
+forge_define_config_item ('server', 'mantis', 'mantis') ;
+forge_define_config_item ('db_name', 'mantis', 'mantis') ;
+forge_define_config_item ('db_host', 'mantis', 'localhost') ;
+forge_define_config_item ('db_passwd', 'mantis', 'secret') ;
+forge_define_config_item ('db_user', 'mantis', 'GForge') ;
+
 class MantisPlugin extends Plugin {
 	function MantisPlugin () {
 		$this->Plugin() ;

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/plugins/mantis/www/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/plugins/mantis/www/index.php	2011-02-28 22:53:08 UTC (rev 15281)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/plugins/mantis/www/index.php	2011-02-28 22:53:11 UTC (rev 15282)
@@ -133,8 +133,8 @@
 	. db_now() . ", TRUE, 5, 1, '', '"
 	.str_replace("'","\\'",$realuser->getRealName())
 	."')";
-	$mycn = mysql_connect($mantis_db_host,$mantis_db_user,$mantis_db_passwd);
-	$test = mysql_select_db($mantis_db_db,$mycn);
+	$mycn = mysql_connect(forge_get_config('db_host','mantis'),forge_get_config('db_user','mantis'),forge_get_config('db_passwd','mantis'));
+	$test = mysql_select_db(forge_get_config('db_name','mantis'),$mycn);
 	$test = mysql_query($sql,$mycn);
 	if ($test) {
 		echo "Insertion dans Mantis BT OK";
@@ -146,8 +146,8 @@
 function update_mantis_user ($id) {
 	$realuser = user_get_object($id);
 	$sql = "UPDATE users SET (username='".$realuser->getUnixName()."',email='".$realuser->getEmail()."',password='".$realuser->getMD5Passwd()."',realname='".str_replace("'","\\'",$realuser->getRealName())."') WHERE id=$id";
-	$mycn = mysql_connect($mantis_db_host,$mantis_db_user,$mantis_db_passwd);
-	$test = mysql_select_db($mantis_db_db,$mycn);
+	$mycn = mysql_connect(forge_get_config('db_host','mantis'),forge_get_config('db_user','mantis'),forge_get_config('db_passwd','mantis'));
+	$test = mysql_select_db(forge_get_config('db_name','mantis'),$mycn);
 	$test = mysql_query($sql,$mycn);
 	if ($test) {
 		echo "Mise à jour dans Mantis BT OK";

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/utils/migrate-to-ini-files.sh
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/utils/migrate-to-ini-files.sh	2011-02-28 22:53:08 UTC (rev 15281)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/utils/migrate-to-ini-files.sh	2011-02-28 22:53:11 UTC (rev 15282)
@@ -2,7 +2,6 @@
 
 set -e
 
-lastsection=''
 config_dir=$(forge_get_config extra_config_dirs | xargs -n 1 echo | head -1)
 if [ "$config_dir" = "" ] ; then
     config_path=$(forge_get_config config_path)/config.ini.d
@@ -28,6 +27,7 @@
     echo "$var = $value"
 }
 
+lastsection=''
 tmp=$(mktemp)
 cat > $tmp <<EOF
 # This is a generated file with values migrated from your previous configuration
@@ -143,9 +143,12 @@
 
 add_config blocks templates >> $tmp
 
+add_config mantis server >> $tmp
+
 mv $tmp $config_path/zzz-migrated-old-config
 chmod 644 $config_path/zzz-migrated-old-config
 
+lastsection=''
 tmp=$(mktemp)
 cat > $tmp <<EOF
 # This is a generated file with values migrated from your previous configuration
@@ -168,5 +171,10 @@
 add_config core ldap_version >> $tmp
 add_config core session_key >> $tmp
 
+add_config mantis db_name >> $tmp
+add_config mantis db_host >> $tmp
+add_config mantis db_user >> $tmp
+add_config mantis db_passwd >> $tmp
+
 mv $tmp $config_path/zzz-migrated-old-secrets
 chmod 600 $config_path/zzz-migrated-old-secrets



More information about the evolvis-commits mailing list