[Fusionforge-commits] r8714 - in trunk/gforge: plugins/svntracker/www www/export www/forum/admin www/people

Alain Peyrat aljeux at libremir.placard.fr.eu.org
Thu Feb 4 19:09:55 CET 2010


Author: aljeux
Date: 2010-02-04 19:09:55 +0100 (Thu, 04 Feb 2010)
New Revision: 8714

Modified:
   trunk/gforge/plugins/svntracker/www/newcommit.php
   trunk/gforge/www/export/projtitl.php
   trunk/gforge/www/forum/admin/ForumAdmin.class.php
   trunk/gforge/www/people/skills_utils.php
Log:
Minor: SQL & accessibility changes

Modified: trunk/gforge/plugins/svntracker/www/newcommit.php
===================================================================
--- trunk/gforge/plugins/svntracker/www/newcommit.php	2010-02-03 20:44:29 UTC (rev 8713)
+++ trunk/gforge/plugins/svntracker/www/newcommit.php	2010-02-04 18:09:55 UTC (rev 8714)
@@ -131,7 +131,7 @@
 {
 	global $file, $svn_tracker_debug;
 	$return = array();
-	$Result = db_query_params ('SELECT * from artifact,artifact_group_list WHERE 
+	$Result = db_query_params ('SELECT * FROM artifact,artifact_group_list WHERE 
 artifact.group_artifact_id=artifact_group_list.group_artifact_id 
 AND artifact_group_list.group_id=$1 AND artifact.artifact_id=$2',
 				   array ($GroupId,
@@ -165,6 +165,7 @@
 							 $Config['ActualVersion'],
 							 $Config['UserName'])) ;
 			if(!$DBRes) {
+				$return['Error']="Problems with Artifact $Num: ".db_error($DBRes)."\n";
 				db_rollback();
 			} else {
 				db_commit();
@@ -190,11 +191,10 @@
 function addTaskLog($Config, $GroupId, $Num)
 {
 	$return = array();
-	$Result = db_query_params ('SELECT * from project_task,project_group_list WHERE 
-project_task.group_project_id=
-project_group_list.group_project_id 
-AND project_task.project_task_id=$1 AND 
- project_group_list.group_id=$2',
+	$Result = db_query_params ('SELECT * FROM project_task,project_group_list
+WHERE project_task.group_project_id=project_group_list.group_project_id 
+AND project_task.project_task_id=$1
+AND project_group_list.group_id=$2',
 			array ($Num,
 				$GroupId));
 	$Rows = db_numrows($Result);

Modified: trunk/gforge/www/export/projtitl.php
===================================================================
--- trunk/gforge/www/export/projtitl.php	2010-02-03 20:44:29 UTC (rev 8713)
+++ trunk/gforge/www/export/projtitl.php	2010-02-04 18:09:55 UTC (rev 8714)
@@ -71,7 +71,7 @@
     }
 }
 
-echo '<h2>Welcome to '.$group->getPublicName().' project!</h2>
+echo '<h1>Welcome to '.$group->getPublicName().' project!</h1>
 <p>';
 
 echo $group->getDescription();

Modified: trunk/gforge/www/forum/admin/ForumAdmin.class.php
===================================================================
--- trunk/gforge/www/forum/admin/ForumAdmin.class.php	2010-02-03 20:44:29 UTC (rev 8713)
+++ trunk/gforge/www/forum/admin/ForumAdmin.class.php	2010-02-04 18:09:55 UTC (rev 8714)
@@ -97,6 +97,7 @@
 	
 	function PrintAdminPendingOption($forum_id) {
 		echo '
+			<p>
 			<a href="pending.php?action=view_pending&amp;group_id=' . $this->group_id . '&amp;forum_id=' . $forum_id . '">' . _('Manage Pending Messages').'</a><br /></p>';
 	}
 	

Modified: trunk/gforge/www/people/skills_utils.php
===================================================================
--- trunk/gforge/www/people/skills_utils.php	2010-02-03 20:44:29 UTC (rev 8713)
+++ trunk/gforge/www/people/skills_utils.php	2010-02-04 18:09:55 UTC (rev 8714)
@@ -96,7 +96,7 @@
 
 function handle_multi_edit($skill_ids) {
 	global $HTML;
-	$result = db_query_params ('select * from skills_data where skills_data_id = ANY ($1)',
+	$result = db_query_params ('SELECT * FROM skills_data WHERE skills_data_id = ANY ($1)',
 				   array (db_int_array_to_any_clause ($skill_ids)));
 	$rows = db_numrows($result);
 	if (!$result || $rows < 1) {




More information about the Fusionforge-commits mailing list