[Fusionforge-commits] FusionForge branch master updated. 97a53437fe70e555a11663332a0ce77aff358daa

Alain Peyrat aljeux at fusionforge.org
Thu Nov 22 21:42:35 CET 2012


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  97a53437fe70e555a11663332a0ce77aff358daa (commit)
      from  7b806dd051d0cb2e161529263fe6cae1cd1d4410 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 97a53437fe70e555a11663332a0ce77aff358daa
Author: Alain Peyrat <aljeux at free.fr>
Date:   Thu Nov 22 21:42:15 2012 +0100

    Minor changes: ident, phpdoc, ...

diff --git a/src/plugins/moinmoin/common/MoinMoinPlugin.class.php b/src/plugins/moinmoin/common/MoinMoinPlugin.class.php
index 28d30f0..ecb47bc 100644
--- a/src/plugins/moinmoin/common/MoinMoinPlugin.class.php
+++ b/src/plugins/moinmoin/common/MoinMoinPlugin.class.php
@@ -44,7 +44,7 @@ class MoinMoinPlugin extends Plugin {
 
 	function getWikiUrl ($project) {
 		if (forge_get_config('use_frame', 'moinmoin')){
-			return util_make_uri('/plugins/moinmoin/frame.php?group_id=' . $project->getID()) ; 
+			return util_make_uri('/plugins/moinmoin/frame.php?group_id=' . $project->getID());
 		} else {
 			return util_make_uri('/plugins/moinmoin/'.$project->getUnixName().'/FrontPage');
 		}
diff --git a/src/plugins/moinmoin/cronjobs/create-wikis.php b/src/plugins/moinmoin/cronjobs/create-wikis.php
index 006ac87..e19a71f 100644
--- a/src/plugins/moinmoin/cronjobs/create-wikis.php
+++ b/src/plugins/moinmoin/cronjobs/create-wikis.php
@@ -1,6 +1,6 @@
 #! /usr/bin/php
 <?php
-/* 
+/*
  * Copyright 2010, Olaf Lenz
  * Copyright 2011, Roland Mas
  *
@@ -23,7 +23,7 @@
 
   /** This script will automatically create MoinMoin instances for
    projects that do not yet have them.
-   
+
    It is intended to be started in a cronjob.
    */
 
@@ -62,7 +62,7 @@ while ( $row = db_fetch_array($project_res) ) {
                       . "sed s/@PROJECT_NAME@/$project/ < $template) > $wikidata/$project.py");
 
 		$need_reload = true;
-	} 
+	}
 }
 
 if ($need_reload) {
diff --git a/src/plugins/online_help/common/online_helpPlugin.class.php b/src/plugins/online_help/common/online_helpPlugin.class.php
index 870b3b0..2b4bb74 100644
--- a/src/plugins/online_help/common/online_helpPlugin.class.php
+++ b/src/plugins/online_help/common/online_helpPlugin.class.php
@@ -38,54 +38,54 @@ class online_helpPlugin extends Plugin {
 		$this->hooks[] = "headermenu"; // to show up in the admin page fro group
 	}
 
-	function CallHook ($hookname, &$params) {
-		if ($hookname == "headermenu") {
-			$guide = util_make_url('/plugins/online_help/');
+	function headermenu($params) {
+		$guide = util_make_uri('/plugins/online_help/');
 
-			$user_guide = array(
-				'user' => 'ug_user.html',
-				'login' => 'ug_getting_started_login.html',
-				'trove' => 'ug_sitewide_trove.html',
-				'snippet' => 'ug_sitewide_snippet.html',
-				'people' => 'ug_sitewide_project_help.html',
-				'home' => 'ug_project.html',
-				'admin' => 'ug_project_project_admin.html',
-				'activity' => 'ug_project_activity.html',
-				'forums' => 'ug_project_forums.html',
-				'tracker' => 'ug_project_tracker.html',
-				'mail' => 'ug_project_mailing_lists.html',
-				'pm' => 'ug_project_task_manager.html',
-				'docman' => 'ug_project_docman.html',
-				'surveys' => 'ug_project_surveys.html',
-				'news' => 'ug_project_news.html',
-				'scm' => 'ug_project_subversion.html',
-				'frs' => 'ug_project_file_releases.html',
-				'wiki' => 'ug_project_wiki.html',
-			);
+		$user_guide = array(
+			'user' => 'ug_user.html',
+			'login' => 'ug_getting_started_login.html',
+			'trove' => 'ug_sitewide_trove.html',
+			'snippet' => 'ug_sitewide_snippet.html',
+			'people' => 'ug_sitewide_project_help.html',
+			'home' => 'ug_project.html',
+			'admin' => 'ug_project_project_admin.html',
+			'activity' => 'ug_project_activity.html',
+			'forums' => 'ug_project_forums.html',
+			'tracker' => 'ug_project_tracker.html',
+			'mail' => 'ug_project_mailing_lists.html',
+			'pm' => 'ug_project_task_manager.html',
+			'docman' => 'ug_project_docman.html',
+			'surveys' => 'ug_project_surveys.html',
+			'news' => 'ug_project_news.html',
+			'scm' => 'ug_project_subversion.html',
+			'frs' => 'ug_project_file_releases.html',
+			'wiki' => 'ug_project_wiki.html',
+		);
 
-			if (strstr($_SERVER['REQUEST_URI'],'softwaremap')) {
-				$guide .= $user_guide['trove'];
-			} elseif (strstr($_SERVER['REQUEST_URI'],'/my/')) {
-				$guide .= $user_guide['user'];
-			} elseif (strstr($_SERVER['REQUEST_URI'],'/account/login.php')) {
-				$guide .= $user_guide['login'];
-			} elseif (strstr($_SERVER['REQUEST_URI'],'/account/')) {
-				$guide .= $user_guide['user'];
-			} elseif (strstr($_SERVER['REQUEST_URI'],'/snippet/')) {
-				$guide .= $user_guide['snippet'];
-			} elseif (strstr($_SERVER['REQUEST_URI'],'/people/')) {
-				$guide .= $user_guide['people'];
-			} elseif (isset($params['toptab']) && isset($user_guide[ $params['toptab'] ])) {
-				$guide .= $user_guide[ $params['toptab'] ];
-			} else {
-				$guide .= 'index.html';
-			}
+		$uri = getStringFromServer('REQUEST_URI');
 
-			$guide = '<a href="javascript:help_window(\''.$guide.'\')">'._('Get Help').'</a>';
-
-			$template = isset($params['template']) ?  $params['template'] : ' | {menu}';
-			echo str_replace('{menu}', $guide, $template);
+		if (strstr($uri,'softwaremap')) {
+			$guide .= $user_guide['trove'];
+		} elseif (strstr($uri,'/my/')) {
+			$guide .= $user_guide['user'];
+		} elseif (strstr($uri,'/account/login.php')) {
+			$guide .= $user_guide['login'];
+		} elseif (strstr($uri,'/account/')) {
+			$guide .= $user_guide['user'];
+		} elseif (strstr($uri,'/snippet/')) {
+			$guide .= $user_guide['snippet'];
+		} elseif (strstr($uri,'/people/')) {
+			$guide .= $user_guide['people'];
+		} elseif (isset($params['toptab']) && isset($user_guide[ $params['toptab'] ])) {
+			$guide .= $user_guide[ $params['toptab'] ];
+		} else {
+			$guide .= 'index.html';
 		}
+
+		$guide = '<a href="javascript:help_window(\''.$guide.'\')">'._('Get Help').'</a>';
+
+		$template = isset($params['template']) ?  $params['template'] : ' | {menu}';
+		echo str_replace('{menu}', $guide, $template);
 	}
 }
 
diff --git a/src/plugins/projectimport/www/index.php b/src/plugins/projectimport/www/index.php
index dc6b7d2..6fbd2d0 100644
--- a/src/plugins/projectimport/www/index.php
+++ b/src/plugins/projectimport/www/index.php
@@ -559,7 +559,7 @@ class ProjectImportPage extends FileManagerPage {
 					foreach($projects as $project) {
 
 						// Display project's general description
-						$html .= '<table id="project-summary-and-devs" class="my-layout-table" summary="">
+						$html .= '<table id="project-summary-and-devs" class="my-layout-table">
 	                               <tr>
 		                             <td>
 			                            <h2>'._('Details of imported project : ').
diff --git a/src/plugins/projectimport/www/projectsimport.php b/src/plugins/projectimport/www/projectsimport.php
index 0eeb165..e8f6ba0 100644
--- a/src/plugins/projectimport/www/projectsimport.php
+++ b/src/plugins/projectimport/www/projectsimport.php
@@ -219,7 +219,7 @@ class ProjectsImportPage extends FileManagerPage {
 			if(count($projects)) {
 
 				// Display project's general description
-				$html .= '<table id="project-summary-and-devs" class="my-layout-table" summary="">';
+				$html .= '<table id="project-summary-and-devs" class="my-layout-table">';
 
 				// Display project attributes
 				foreach($projects as $project) {
diff --git a/src/plugins/webanalytics/common/webanalyticsPlugin.class.php b/src/plugins/webanalytics/common/webanalyticsPlugin.class.php
index 907b8b4..db6d0ed 100644
--- a/src/plugins/webanalytics/common/webanalyticsPlugin.class.php
+++ b/src/plugins/webanalytics/common/webanalyticsPlugin.class.php
@@ -46,6 +46,8 @@ class webanalyticsPlugin extends Plugin {
 				$returned = true;
 				break;
 			}
+			default:
+				$returned = false;
 		}
 		return $returned;
 	}
@@ -80,8 +82,8 @@ class webanalyticsPlugin extends Plugin {
 	/**
 	 * addLink - add a new valid link
 	 *
-	 * @param	string	the url
-	 * @param	string	an informative name
+	 * @param	string	$url	the url
+	 * @param	string	$name	an informative name
 	 * @return	bool	success or not
 	 */
 	function addLink($url, $name) {
@@ -105,7 +107,7 @@ class webanalyticsPlugin extends Plugin {
 	/**
 	 * deleteLink - delete a link
 	 *
-	 * @param	int	the link id
+	 * @param	int	$idLink	the link id
 	 * @return	bool	success or not
 	 */
 	function deleteLink($idLink) {
@@ -144,7 +146,7 @@ class webanalyticsPlugin extends Plugin {
 	/**
 	 * getHeader - initialize header and js
 	 *
-	 * @param	string	type : user, project, globaladmin (aka group)
+	 * @param	string	$type : user, project, globaladmin (aka group)
 	 * @return	bool	success or not
 	 */
 	function getHeader($type) {
diff --git a/src/plugins/wiki/cronjobs/template_groups/www/index.html b/src/plugins/wiki/cronjobs/template_groups/www/index.html
index d6a2680..d656cb3 100644
--- a/src/plugins/wiki/cronjobs/template_groups/www/index.html
+++ b/src/plugins/wiki/cronjobs/template_groups/www/index.html
@@ -1,5 +1,9 @@
-<html>
+<!DOCTYPE html>
+<head>
+    <meta charset="UTF-8" />
+    <title>This project has not created its website yet!</title> 
+</head>
 <body>
 <h1>This project has not created its website yet!</h1> 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/plugins/wiki/etc/cron.d/fusionforge-plugin-wiki b/src/plugins/wiki/etc/cron.d/fusionforge-plugin-wiki
index 9b09516..a5b3066 100644
--- a/src/plugins/wiki/etc/cron.d/fusionforge-plugin-wiki
+++ b/src/plugins/wiki/etc/cron.d/fusionforge-plugin-wiki
@@ -3,8 +3,6 @@
 # Copyright 1999-2001 (c) VA Linux Systems
 # Copyright 2002-2004 (c) GForge, LLC, Ognyan Kulev
 # http://fusionforge.org/
-#
-# YOUR php.ini FOR PHP CLI MUST HAVE APPROPRIATE include_path
 
 # Change path to the GForge directory.
 GFORGE="/opt/gforge"
diff --git a/src/www/export/rssAboTask.php b/src/www/export/rssAboTask.php
index a7239c7..3cc239b 100644
--- a/src/www/export/rssAboTask.php
+++ b/src/www/export/rssAboTask.php
@@ -139,11 +139,11 @@ function writeRssFeedBegin($objProjectTask, $objGroup, $objProjectGroup) {
 	printf(_('Update history of the task with the name %1$s and the ID %2$d.') . ' ', $objProjectTask->getSummary(), $objProjectTask->getID());
 	print _('Current values of the task’s…').' => ';
 
-	print ' '._('Subproject:').' '.$objProjectGroup->getName().' |';
-	print ' '._('Summary:').' '.$objProjectTask->getSummary().' |';
-	print ' '._('Complete:').' '.$objProjectTask->getPercentComplete().'% |';
-	print ' '._('Status:').' '.$objProjectTask->getStatusName().' |';
-	print ' '._('Details:').' '.$objProjectTask->getDetails().' |';
+	print ' '._('Subproject')._(': ').$objProjectGroup->getName().' |';
+	print ' '._('Summary')._(': ').$objProjectTask->getSummary().' |';
+	print ' '._('Complete')._(': ').$objProjectTask->getPercentComplete().'% |';
+	print ' '._('Status')._(': ').$objProjectTask->getStatusName().' |';
+	print ' '._('Details')._(': ').$objProjectTask->getDetails().' |';
 
 	print'</description>';
 	//print'<language>en-us</language>';
@@ -166,11 +166,11 @@ function writeRssFeedItem($objProjectTask, $updates) {
 		print $title;
 		print'</title>';
 		print'<description>';
-		print _('Updated value').': ';
+		print _('Updated value')._(': ');
 		print $description.' | ';
-		print _('Posted by').': ';
+		print _('Posted by')._(': ');
 		print $objGfUser->getUnixName().' | ';
-		print _('Update time').': ';
+		print _('Update time')._(': ');
 		print gmdate('D, d M Y G:i:s',$update[8]);
 		print'</description>';
 		print '<link>' . util_make_url("/pm/t_follow.php/" . $objProjectTask->getID()) . '</link>';

-----------------------------------------------------------------------

Summary of changes:
 .../moinmoin/common/MoinMoinPlugin.class.php       |    2 +-
 src/plugins/moinmoin/cronjobs/create-wikis.php     |    6 +-
 .../online_help/common/online_helpPlugin.class.php |   88 ++++++++++----------
 src/plugins/projectimport/www/index.php            |    2 +-
 src/plugins/projectimport/www/projectsimport.php   |    2 +-
 .../common/webanalyticsPlugin.class.php            |   10 ++-
 .../wiki/cronjobs/template_groups/www/index.html   |    8 +-
 .../wiki/etc/cron.d/fusionforge-plugin-wiki        |    2 -
 src/www/export/rssAboTask.php                      |   16 ++--
 9 files changed, 70 insertions(+), 66 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list