[Fusionforge-commits] r9723 - in trunk/gforge: plugins/mediawiki/www www/pm

Roland Mas lolando at libremir.placard.fr.eu.org
Mon May 10 17:04:27 CEST 2010


Author: lolando
Date: 2010-05-10 17:04:27 +0200 (Mon, 10 May 2010)
New Revision: 9723

Modified:
   trunk/gforge/plugins/mediawiki/www/plugin_admin.php
   trunk/gforge/www/pm/mod_task.php
   trunk/gforge/www/pm/t_lookup.php
Log:
Fixed deprecations after a series of patches ported from Evolvis 4.8

Modified: trunk/gforge/plugins/mediawiki/www/plugin_admin.php
===================================================================
--- trunk/gforge/plugins/mediawiki/www/plugin_admin.php	2010-05-10 15:04:16 UTC (rev 9722)
+++ trunk/gforge/plugins/mediawiki/www/plugin_admin.php	2010-05-10 15:04:27 UTC (rev 9723)
@@ -83,8 +83,6 @@
     $group_unix_name . "/images/.wgLogo.png");
 
 if (getStringFromRequest("logo_submit")) {
-	global $groupdir_prefix, $sys_use_manual_uploads;
-
 	$userfile = getUploadedFile('userfile');
 	$userfile_name = $userfile['name'];
 	$manual_filename = getStringFromRequest('manual_filename');
@@ -115,10 +113,10 @@
 			$feedback = _('Unknown file upload error.');
 			break;
 		}
-	} else if ($sys_use_manual_uploads && $manual_filename &&
+	} else if (forge_get_config ('use_manual_uploads') && $manual_filename &&
 	    util_is_valid_filename($manual_filename) &&
 	    is_file($incoming.'/'.$manual_filename)) {
-		$incoming = "$groupdir_prefix/$group_unix_name/incoming";
+		$incoming = forge_get_config('groupdir_prefix')."/$group_unix_name/incoming";
 		$infile = $incoming.'/'.$manual_filename;
 		$fname = $manual_filename;
 		$move = false;
@@ -168,8 +166,8 @@
 </span>
 <p><?php echo _('Upload a new file') ?>: <input type="file" name="userfile"
  size="30" /></p>
-<?php if ($sys_use_manual_uploads) {
-	$incoming = $groupdir_prefix."/".$group_unix_name."/incoming" ;
+	  <?php if (forge_get_config('use_manual_uploads')) {
+$incoming = forge_get_config('groupdir_prefix')."/$group_unix_name/incoming" ;
 
 	echo '<p>';
 	printf(_('Alternatively, you can use a file you already uploaded (by SFTP or SCP) to the project\'s incoming directory (%1$s).'),

Modified: trunk/gforge/www/pm/mod_task.php
===================================================================
--- trunk/gforge/www/pm/mod_task.php	2010-05-10 15:04:16 UTC (rev 9722)
+++ trunk/gforge/www/pm/mod_task.php	2010-05-10 15:04:27 UTC (rev 9723)
@@ -36,7 +36,7 @@
 			<?php echo $pt->getSubmittedRealName(); ?> (<?php echo $pt->getSubmittedUnixName(); ?>)</td>
 		<td><input type="submit" value="<?php echo _('Submit') ?>" name="submit" /></td>
 		<td><strong>Task ID:</strong> <?php echo $project_task_id; ?> @ <?php
-		    echo $GLOBALS['sys_default_domain']; ?></td>
+		echo forge_get_config ('web_host') ; ?></td>
 	</tr>
 
 	<tr>

Modified: trunk/gforge/www/pm/t_lookup.php
===================================================================
--- trunk/gforge/www/pm/t_lookup.php	2010-05-10 15:04:16 UTC (rev 9722)
+++ trunk/gforge/www/pm/t_lookup.php	2010-05-10 15:04:27 UTC (rev 9723)
@@ -91,8 +91,8 @@
 }
 
 $tinfo['public'] = $ispublic;
-$tinfo['forge_base'] = $sys_default_domain;
-$tinfo['forge_name'] = $sys_name;
+$tinfo['forge_base'] = forge_get_config ('web_host') ;
+$tinfo['forge_name'] = forge_get_config ('forge_name') ;
 
 header("Content-type: " . $asformat);
 echo minijson_encode($tinfo) . "\n";




More information about the Fusionforge-commits mailing list