[Fusionforge-commits] r9985 - in trunk/gforge: cronjobs debian/patches plugins/ldapextauth/etc/plugins/ldapextauth plugins/mediawiki/www plugins/scmcvs/bin www/admin/trove www/search/include/renderers www/survey/admin

Roland Mas lolando at libremir.placard.fr.eu.org
Thu Jun 3 13:41:03 CEST 2010


Author: lolando
Date: 2010-06-03 13:41:03 +0200 (Thu, 03 Jun 2010)
New Revision: 9985

Modified:
   trunk/gforge/cronjobs/backup_site.php
   trunk/gforge/cronjobs/homedirs.php
   trunk/gforge/debian/patches/use-snoopy-from-distro.dpatch
   trunk/gforge/plugins/ldapextauth/etc/plugins/ldapextauth/mapping.php
   trunk/gforge/plugins/mediawiki/www/LocalSettings.php
   trunk/gforge/plugins/scmcvs/bin/aclcheck.php
   trunk/gforge/www/admin/trove/trove_cat_edit.php
   trunk/gforge/www/search/include/renderers/ProjectRssSearchRenderer.class.php
   trunk/gforge/www/survey/admin/graphs.php
Log:
Removed a few mentions of local.inc

Modified: trunk/gforge/cronjobs/backup_site.php
===================================================================
--- trunk/gforge/cronjobs/backup_site.php	2010-06-03 10:36:30 UTC (rev 9984)
+++ trunk/gforge/cronjobs/backup_site.php	2010-06-03 11:41:03 UTC (rev 9985)
@@ -25,9 +25,9 @@
 require $gfcommon.'include/cron_utils.php';
 
 
-$database=forge_get_config('database_name'); //Database name from local.inc
-$username=forge_get_config('database_user'); //Username used to log on to data base
-$password=forge_get_config('database_password'); //Db Password 
+$database=forge_get_config('database_name');
+$username=forge_get_config('database_user');
+$password=forge_get_config('database_password');
 
 $datetime=date('Y-m-d'); //we will use this to concatenate it with the tar filename
 
@@ -81,7 +81,7 @@
 		$err.= implode("\n", $output);
 	}
 } else {
-		$err.= 'Unable to find Upload Dir. Value on local.inc is:'.forge_get_config('upload_dir');
+		$err.= 'Unable to find upload dir. Configured value is:'.forge_get_config('upload_dir');
 }
 
 /**************************************
@@ -109,7 +109,7 @@
 		$err.= implode("\n", $output);
 	}
 } else {
-	$err.= 'Unable to find CVSROOT Dir. Value on local.inc is:'.$cvsdir_prefix;
+	$err.= 'Unable to find CVSROOT dir. Configured value is:'.$cvsdir_prefix;
 }
 
 /**************************************
@@ -151,7 +151,7 @@
 		@exec("rm -rf ".$repos_backup_dir);
 	}
 } else {
-	$err.= 'Unable to find SVNROOT Dir. Value on local.inc is:'.$svndir_prefix;
+	$err.= 'Unable to find SVNROOT dir. Configured value is:'.$svndir_prefix;
 }
 
 /**************************************

Modified: trunk/gforge/cronjobs/homedirs.php
===================================================================
--- trunk/gforge/cronjobs/homedirs.php	2010-06-03 10:36:30 UTC (rev 9984)
+++ trunk/gforge/cronjobs/homedirs.php	2010-06-03 11:41:03 UTC (rev 9985)
@@ -60,7 +60,7 @@
 //error variable
 $err = '';
 
-if (forge_get_config('groupdir_prefix') == '') {		// this should be set in local.inc
+if (forge_get_config('groupdir_prefix') == '') {		// this should be set in configuration
 	exit () ;
 }
 
@@ -68,7 +68,7 @@
 	@mkdir(forge_get_config('groupdir_prefix'),0755,true);
 }
 
-if (forge_get_config('homedir_prefix') == '') {		// this should be set in local.inc
+if (forge_get_config('homedir_prefix') == '') {		// this should be set in configuration
 	exit () ;
 }
 

Modified: trunk/gforge/debian/patches/use-snoopy-from-distro.dpatch
===================================================================
--- trunk/gforge/debian/patches/use-snoopy-from-distro.dpatch	2010-06-03 10:36:30 UTC (rev 9984)
+++ trunk/gforge/debian/patches/use-snoopy-from-distro.dpatch	2010-06-03 11:41:03 UTC (rev 9985)
@@ -7,8 +7,8 @@
 
 @DPATCH@
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gforge~/plugins/cvstracker/bin/post.php gforge/plugins/cvstracker/bin/post.php
---- gforge~/plugins/cvstracker/bin/post.php	2010-06-02 17:03:55.000000000 +0200
-+++ gforge/plugins/cvstracker/bin/post.php	2010-06-02 20:08:55.000000000 +0200
+--- gforge~/plugins/cvstracker/bin/post.php	2010-06-02 20:10:15.000000000 +0200
++++ gforge/plugins/cvstracker/bin/post.php	2010-06-03 13:38:29.000000000 +0200
 @@ -33,7 +33,7 @@
  require dirname(__FILE__).'/../../env.inc.php';
  require_once $gfwww.'include/pre.php';
@@ -19,20 +19,20 @@
  $cvs_binary_version = get_cvs_binary_version () ;
  
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gforge~/plugins/scmcvs/bin/aclcheck.php gforge/plugins/scmcvs/bin/aclcheck.php
---- gforge~/plugins/scmcvs/bin/aclcheck.php	2010-05-28 15:36:11.000000000 +0200
-+++ gforge/plugins/scmcvs/bin/aclcheck.php	2010-06-02 20:08:55.000000000 +0200
+--- gforge~/plugins/scmcvs/bin/aclcheck.php	2010-06-03 13:36:11.000000000 +0200
++++ gforge/plugins/scmcvs/bin/aclcheck.php	2010-06-03 13:38:29.000000000 +0200
 @@ -31,7 +31,7 @@
- require $gfcgfile;
+ require_once $gfwww. 'include/pre.php';
  require_once $gfcommon.'include/utils.php';
  require_once $gfconfig.'plugins/scmcvs/config.php';
--require $gfplugins.'scmcvs/common/Snoopy.class.php';
-+require '/usr/share/php/libphp-snoopy/Snoopy.class.php';
+-require_once $gfplugins.'scmcvs/common/Snoopy.class.php';
++require_once '/usr/share/php/libphp-snoopy/Snoopy.class.php';
  
  // Input cleansing
  $env_cvsroot = (string) $_ENV['CVSROOT'];
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gforge~/plugins/svntracker/bin/post.php gforge/plugins/svntracker/bin/post.php
---- gforge~/plugins/svntracker/bin/post.php	2010-06-02 16:32:18.000000000 +0200
-+++ gforge/plugins/svntracker/bin/post.php	2010-06-02 20:08:55.000000000 +0200
+--- gforge~/plugins/svntracker/bin/post.php	2010-06-02 20:10:15.000000000 +0200
++++ gforge/plugins/svntracker/bin/post.php	2010-06-03 13:38:29.000000000 +0200
 @@ -31,7 +31,7 @@
   */
  

Modified: trunk/gforge/plugins/ldapextauth/etc/plugins/ldapextauth/mapping.php
===================================================================
--- trunk/gforge/plugins/ldapextauth/etc/plugins/ldapextauth/mapping.php	2010-06-03 10:36:30 UTC (rev 9984)
+++ trunk/gforge/plugins/ldapextauth/etc/plugins/ldapextauth/mapping.php	2010-06-03 11:41:03 UTC (rev 9985)
@@ -3,7 +3,7 @@
 *
 * These are pairs of internal user variables and LDAP attributes used when
 * creating new accounts, top half are required, bottom half are optional.
-* Note you can use global config variables defined in local.inc or elsewhere.
+* Note you can use global config variables with forge_get_config()
 */
 
 function plugin_ldapextauth_mapping ($entry) {

Modified: trunk/gforge/plugins/mediawiki/www/LocalSettings.php
===================================================================
--- trunk/gforge/plugins/mediawiki/www/LocalSettings.php	2010-06-03 10:36:30 UTC (rev 9984)
+++ trunk/gforge/plugins/mediawiki/www/LocalSettings.php	2010-06-03 11:41:03 UTC (rev 9985)
@@ -22,11 +22,9 @@
    *  Mediawiki plugin of FusionForge.
    */
 
-include dirname(__FILE__) . '/../../env.inc.php';
-include $gfcgfile;
+require_once dirname(__FILE__) . '/../../env.inc.php';
+require_once $gfwww. 'include/pre.php';
 
-include $gfwww. 'include/pre.php';
-
 $IP = forge_get_config('master_path', 'mediawiki');
 
 if (!isset ($fusionforgeproject)) {

Modified: trunk/gforge/plugins/scmcvs/bin/aclcheck.php
===================================================================
--- trunk/gforge/plugins/scmcvs/bin/aclcheck.php	2010-06-03 10:36:30 UTC (rev 9984)
+++ trunk/gforge/plugins/scmcvs/bin/aclcheck.php	2010-06-03 11:41:03 UTC (rev 9985)
@@ -28,10 +28,10 @@
 }
 
 require_once dirname(__FILE__).'/../../env.inc.php';
-require $gfcgfile;
+require_once $gfwww. 'include/pre.php';
 require_once $gfcommon.'include/utils.php';
 require_once $gfconfig.'plugins/scmcvs/config.php';
-require $gfplugins.'scmcvs/common/Snoopy.class.php';
+require_once $gfplugins.'scmcvs/common/Snoopy.class.php';
 
 // Input cleansing
 $env_cvsroot = (string) $_ENV['CVSROOT'];

Modified: trunk/gforge/www/admin/trove/trove_cat_edit.php
===================================================================
--- trunk/gforge/www/admin/trove/trove_cat_edit.php	2010-06-03 10:36:30 UTC (rev 9984)
+++ trunk/gforge/www/admin/trove/trove_cat_edit.php	2010-06-03 11:41:03 UTC (rev 9985)
@@ -94,7 +94,7 @@
 if (getStringFromRequest("delete")) {
 	$form_trove_cat_id = getIntFromRequest('form_trove_cat_id');
 	if ($form_trove_cat_id==forge_get_config('default_trove_cat')){
-		exit_error( _('Error In Trove Operation, can\'t delete trove category define as default in local.inc'));
+		exit_error( _('Error in trove operation, can\'t delete trove category defined as default in configuration.'));
 	}
 	trove_del_cat_id($form_trove_cat_id);
 	session_redirect("/admin/trove/trove_cat_list.php");

Modified: trunk/gforge/www/search/include/renderers/ProjectRssSearchRenderer.class.php
===================================================================
--- trunk/gforge/www/search/include/renderers/ProjectRssSearchRenderer.class.php	2010-06-03 10:36:30 UTC (rev 9984)
+++ trunk/gforge/www/search/include/renderers/ProjectRssSearchRenderer.class.php	2010-06-03 11:41:03 UTC (rev 9985)
@@ -20,7 +20,6 @@
  * @return string additionnal information added in the RSS document
  */
 function rssProjectCallback($dataRow) {
-	// forge_get_config('default_trove_cat') defined in local.inc
 	$result = db_query_params ('SELECT trove_cat.fullpath FROM trove_group_link, trove_cat
 WHERE trove_group_link.trove_cat_root=$1
 AND trove_group_link.trove_cat_id=trove_cat.trove_cat_id

Modified: trunk/gforge/www/survey/admin/graphs.php
===================================================================
--- trunk/gforge/www/survey/admin/graphs.php	2010-06-03 10:36:30 UTC (rev 9984)
+++ trunk/gforge/www/survey/admin/graphs.php	2010-06-03 11:41:03 UTC (rev 9985)
@@ -26,7 +26,7 @@
     exit_error('Error', 'Package JPGraph not installed');
 }
 
-// Read jPGraph libraries. Make sure the forge_get_config('jpgraph_path') is correct in local.inc
+// Read jPGraph libraries.
 require_once forge_get_config('jpgraph_path').'/jpgraph.php';
 require_once forge_get_config('jpgraph_path').'/jpgraph_line.php';
 require_once forge_get_config('jpgraph_path').'/jpgraph_bar.php';




More information about the Fusionforge-commits mailing list