[Fusionforge-commits] r10582 - in trunk/src: plugins/blocks/common www/forum/admin www/frs www/frs/admin www/tracker/admin

Franck VILLAUME nerville at libremir.placard.fr.eu.org
Tue Sep 21 12:06:11 CEST 2010


Author: nerville
Date: 2010-09-21 12:06:11 +0200 (Tue, 21 Sep 2010)
New Revision: 10582

Modified:
   trunk/src/plugins/blocks/common/blocksPlugin.class.php
   trunk/src/www/forum/admin/ForumAdmin.class.php
   trunk/src/www/forum/admin/attachments.php
   trunk/src/www/forum/admin/index.php
   trunk/src/www/forum/admin/monitor.php
   trunk/src/www/forum/admin/pending.php
   trunk/src/www/forum/admin/pendingmsgdetail.php
   trunk/src/www/frs/admin/showreleases.php
   trunk/src/www/frs/index.php
   trunk/src/www/frs/monitor.php
   trunk/src/www/frs/shownotes.php
   trunk/src/www/tracker/admin/form-addextrafield.php
   trunk/src/www/tracker/admin/form-addextrafieldoption.php
   trunk/src/www/tracker/admin/form-updateextrafield.php
   trunk/src/www/tracker/admin/form-updateextrafieldelement.php
   trunk/src/www/tracker/admin/index.php
   trunk/src/www/tracker/admin/updates.php
Log:
exit functions migration

Modified: trunk/src/plugins/blocks/common/blocksPlugin.class.php
===================================================================
--- trunk/src/plugins/blocks/common/blocksPlugin.class.php	2010-09-21 07:24:37 UTC (rev 10581)
+++ trunk/src/plugins/blocks/common/blocksPlugin.class.php	2010-09-21 10:06:11 UTC (rev 10582)
@@ -135,17 +135,17 @@
 	function parseContent($t) {
 		global $HTML;
 
-		$t =& preg_replace('/<p>{boxTop (.*?)}<\/p>/ie', '$HTML->boxTop("$1")', $t);
-		$t =& preg_replace('/{boxTop (.*?)}/ie', '$HTML->boxTop("$1")', $t);
-		$t =& preg_replace('/<p>{boxMiddle (.*?)}<\/p>/ie', '$HTML->boxMiddle("$1")', $t);
-		$t =& preg_replace('/{boxMiddle (.*?)}/ie', '$HTML->boxMiddle("$1")', $t);
-		$t =& preg_replace('/<p>{boxBottom}<\/p>/i', $HTML->boxBottom(), $t);
-		$t =& preg_replace('/{boxBottom}/i', $HTML->boxBottom(), $t);
+		$t = preg_replace('/<p>{boxTop (.*?)}<\/p>/ie', '$HTML->boxTop("$1")', $t);
+		$t = preg_replace('/{boxTop (.*?)}/ie', '$HTML->boxTop("$1")', $t);
+		$t = preg_replace('/<p>{boxMiddle (.*?)}<\/p>/ie', '$HTML->boxMiddle("$1")', $t);
+		$t = preg_replace('/{boxMiddle (.*?)}/ie', '$HTML->boxMiddle("$1")', $t);
+		$t = preg_replace('/<p>{boxBottom}<\/p>/i', $HTML->boxBottom(), $t);
+		$t = preg_replace('/{boxBottom}/i', $HTML->boxBottom(), $t);
 
-		$t =& preg_replace('/<p>{boxHeader}/i', '<hr />', $t);
-		$t =& preg_replace('/{boxHeader}/i', '<hr />', $t);
-		$t =& preg_replace('/{boxFooter}<\/p>/i', '<hr />', $t);
-		$t =& preg_replace('/{boxFooter}/i', '<hr />', $t);
+		$t = preg_replace('/<p>{boxHeader}/i', '<hr />', $t);
+		$t = preg_replace('/{boxHeader}/i', '<hr />', $t);
+		$t = preg_replace('/{boxFooter}<\/p>/i', '<hr />', $t);
+		$t = preg_replace('/{boxFooter}/i', '<hr />', $t);
 		
 		return $t;
 	}

Modified: trunk/src/www/forum/admin/ForumAdmin.class.php
===================================================================
--- trunk/src/www/forum/admin/ForumAdmin.class.php	2010-09-21 07:24:37 UTC (rev 10581)
+++ trunk/src/www/forum/admin/ForumAdmin.class.php	2010-09-21 10:06:11 UTC (rev 10582)
@@ -1,35 +1,30 @@
 <?php
-
 /**
- * GForge Forum Admin Class
+ * Forum Admin Class
  *
- * Portions Copyright 1999-2001 (c) VA Linux Systems
- * The rest Copyright 2002-2004 (c) GForge Team
- * http://gforge.org/
+ * Copyright 1999-2001 (c) VA Linux Systems
+ * Copyright 2002-2004 (c) GForge Team
+ * Copyright 2005 (c) Daniel Perez
+ * Copyright 2010 (c) Franck Villaume - Capgemini
+ * http://fusionforge.org/
  *
- * @version   
+ * This file is part of FusionForge.
  *
- * This file is part of GForge.
- *
- * GForge is free software; you can redistribute it and/or modify
+ * FusionForge is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GForge is distributed in the hope that it will be useful,
+ * FusionForge is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GForge; if not, write to the Free Software
+ * along with FusionForge; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* forum admin class
-	by Daniel Perez - 2005
-*/
-
 require_once $gfcommon.'include/pre.php';
 
 class ForumAdmin extends Error {
@@ -56,7 +51,6 @@
 	 */
 	
 	function PrintAdminMessageOptions($msg_id,$group_id,$thread_id=0,$forum_id=0,$return_to_message=0) {
-		global $HTML;
 		
 		$return = '<a href="admin/index.php?movethread=' . $thread_id  . '&amp;msg_id=' . $msg_id . '&amp;group_id=' . $group_id . '&amp;forum_id=' . $forum_id .
 				  '&amp;return_to_message=' . $return_to_message . '">' . html_image('ic/forum_move.gif','37','15',array('alt'=>_('Move thread'))). "</a>";
@@ -161,7 +155,7 @@
 	 *  @param  string	 action to execute.
 	 */
 	function ExecuteAction ($action) {
-		global $HTML;
+        global $HTML;
 		
 		if ($action == "change_status") { //change a forum
 			$forum_name = getStringFromRequest('forum_name');
@@ -176,15 +170,15 @@
 			*/
 			$f=new Forum($this->g,$group_forum_id);
 			if (!$f || !is_object($f)) {
-				exit_error(_('Error'),_('Error getting Forum'));
+				exit_error(_('Error getting Forum'),'forums');
 			} elseif ($f->isError()) {
-				exit_error(_('Error'),$f->getErrorMessage());
+				exit_error($f->getErrorMessage(),'forums');
 			}
 
 			session_require_perm ('forum_admin', $f->Group->getID()) ;
 
 			if (!$f->update($forum_name,$description,$allow_anonymous,$is_public,$send_all_posts_to,$moderation_level)) {
-				exit_error(_('Error'),$f->getErrorMessage());
+				exit_error($f->getErrorMessage(),'forums');
 			} else {
 				$feedback = _('Forum Info Updated Successfully');
 			}
@@ -202,19 +196,19 @@
 			*/
 			if (!forge_check_perm ('forum_admin', $this->g->getID())) {
 				form_release_key(getStringFromRequest("form_key"));
-				exit_permission_denied();
+				exit_permission_denied('forums');
 			}
 			$f=new Forum($this->g);
 			if (!$f || !is_object($f)) {
 				form_release_key(getStringFromRequest("form_key"));
-				exit_error(_('Error'),_('Error getting Forum'));
+				exit_error(_('Error getting Forum'),'forums');
 			} elseif ($f->isError()) {
 				form_release_key(getStringFromRequest("form_key"));
-				exit_error(_('Error'),$f->getErrorMessage());
+				exit_error($f->getErrorMessage(),'forums');
 			}
 			if (!$f->create($forum_name,$description,$is_public,$send_all_posts_to,1,$allow_anonymous,$moderation_level)) {
 				form_release_key(getStringFromRequest("form_key"));
-				exit_error(_('Error'),$f->getErrorMessage());
+				exit_error($f->getErrorMessage(),'forums');
 			} else {
 				$feedback = _('Forum created successfully');
 			}
@@ -225,22 +219,22 @@
 			$forum_id = getIntFromRequest('forum_id');
 			$f=new Forum($this->g,$forum_id);
 			if (!$f || !is_object($f)) {
-				exit_error(_('Error'),_('Error getting Forum'));
+				exit_error(_('Error getting Forum'),'forums');
 			} elseif ($f->isError()) {
-				exit_error(_('Error'),$f->getErrorMessage());
+				exit_error($f->getErrorMessage(),'forums');
 			}
 
 			session_require_perm ('forum_admin', $f->Group->getID()) ;
 
 			$fm=new ForumMessage($f,$msg_id);
 			if (!$fm || !is_object($fm)) {
-				exit_error(_('Error'),_('Error Getting ForumMessage'));
+				exit_error(_('Error Getting ForumMessage'),'forums');
 			} elseif ($fm->isError()) {
-				exit_error(_('Error'),$fm->getErrorMessage());
+				exit_error($fm->getErrorMessage(),'forums');
 			}
 			$count=$fm->delete();
 			if (!$count || $fm->isError()) {
-				exit_error(_('Error'),$fm->getErrorMessage());
+				exit_error($fm->getErrorMessage(),'forums');
 			} else {
 				$feedback = sprintf(ngettext('%1$s message deleted', '%1$s messages deleted', $count), $count);
 			}
@@ -253,15 +247,15 @@
 			$group_forum_id = getIntFromRequest('group_forum_id');
 			$f=new Forum($this->g,$group_forum_id);
 			if (!$f || !is_object($f)) {
-				exit_error(_('Error'),_('Error getting Forum'));
+				exit_error(_('Error getting Forum'),'forums');
 			} elseif ($f->isError()) {
-				exit_error(_('Error'),$f->getErrorMessage());
+				exit_error($f->getErrorMessage(),'forums');
 			}
 
 			session_require_perm ('forum_admin', $f->Group->getID()) ;
 
 			if (!$f->delete(getStringFromRequest('sure'),getStringFromRequest('really_sure'))) {
-				exit_error(_('Error'),$f->getErrorMessage());
+				exit_error($f->getErrorMessage(),'forums');
 			} else {
 				$feedback = _('Successfully Deleted');
 			}
@@ -388,15 +382,13 @@
 						db_begin();
 						if (!db_query_params ('DELETE FROM forum_pending_attachment WHERE msg_id=$1',
 			array ($msgids[$i]))) {
-							$feedback .= "DB Error ";
-							$feedback .= db_error() . "<br />";
+							$error_msg .= "DB Error: ". db_error();
 							db_rollback();
 							break;
 						}
 						if (!db_query_params ('DELETE FROM forum_pending_messages WHERE msg_id=$1',
 			array ($msgids[$i]))) {
-							$feedback .= "DB Error ";
-							$feedback .= db_error() . "<br />";
+							$error_msg .= "DB Error: ". db_error();
 							db_rollback();
 							break;
 						}
@@ -409,26 +401,26 @@
 						$res1 = db_query_params ('SELECT * FROM forum_pending_messages WHERE msg_id=$1',
 			array ($msgids[$i]));
 						if (!$res1) {
-							$feedback .= "DB Error " . db_error() . "<br />";
+							$error_msg .= "DB Error: " . db_error();
 							break;
 						}
 						$res2 = db_query_params ('SELECT * FROM forum_pending_attachment WHERE msg_id=$1',
 			array ($msgids[$i]));
 						if (!$res2) {
-							$feedback .= "DB Error " . db_error() . "<br />";
+							$error_msg .= "DB Error " . db_error();
 							break;
 						}
 						$f = new Forum($this->g,$forum_id);
 						if (!$f || !is_object($f)) {
-							exit_error(_('Error'),_('Error getting new Forum'));
+							exit_error(_('Error getting new Forum'),'forums');
 						} elseif ($f->isError()) {
-							exit_error(_('Error'),$f->getErrorMessage());
+							exit_error($f->getErrorMessage(),'forums');
 						}
 						$fm = new ForumMessage($f); // pending = false
 						if (!$fm || !is_object($fm)) {
-							exit_error(_('Error'), "Error getting new ForumMessage");
+							exit_error(_('Error getting new ForumMessage'),'forums');
 						} elseif ($fm->isError()) {
-							exit_error(_('Error'),"Error getting new ForumMessage: ".$fm->getErrorMessage());
+							exit_error(_('Error getting new ForumMessage: ').$fm->getErrorMessage(),'forums');
 						}
 						$group_forum_id = db_result($res1,0,"group_forum_id");
 						$subject = db_result($res1,0,"subject");
@@ -464,9 +456,9 @@
 							if ($fm->isError()) {
 							    if ( $fm->getErrorMessage() == (_('Couldn\'t Update Master Thread parent with current time')) ) {
 							    	//the thread which the message was replying to doesn't exist any more
-							    	$feedback .= "( " . $subject . " ) " . _('The thread which the message was posted to doesn\'t exist anymore, please delete the message.') . "<br />";
+							    	$feedback .= "( " . $subject . " ) " . _('The thread which the message was posted to doesn\'t exist anymore, please delete the message.');
 							    } else {
-									$feedback .= "$msg_id - " . $fm->getErrorMessage() . "<br />";
+									$error_msg .= "$msg_id - " . $fm->getErrorMessage();
 							    }
 								$deleteok = false;
 							}
@@ -481,8 +473,7 @@
 								db_begin();
 								if (!db_query_params ('DELETE FROM forum WHERE msg_id=$1',
 										      array ($fm->getID()))) {
-									$feedback .= "DB Error ";
-									$feedback .= db_error() . "<br />";
+									$error_msg .= "DB Error ". db_error();
 									db_rollback();
 									break;
 								}
@@ -496,15 +487,13 @@
 							db_begin();
 							if (!db_query_params ('DELETE FROM forum_pending_attachment WHERE msg_id=$1',
 			array ($msgids[$i]))) {
-								$feedback .= "DB Error ";
-								$feedback .= db_error() . "<br />";
+								$error_msg .= "DB Error: ". db_error();
 								db_rollback();
 								break;
 							}
 							if (!db_query_params ('DELETE FROM forum_pending_messages WHERE msg_id=$1',
 			array ($msgids[$i]))) {
-								$feedback .= "DB Error ";
-								$feedback .= db_error() . "<br />";
+								$error_msg .= "DB Error: ". db_error();
 								db_rollback();
 								break;
 							}
@@ -518,7 +507,6 @@
 			$this->ExecuteAction("view_pending");
 		}
 	}
-	
 }
 
 // Local Variables:

Modified: trunk/src/www/forum/admin/attachments.php
===================================================================
--- trunk/src/www/forum/admin/attachments.php	2010-09-21 07:24:37 UTC (rev 10581)
+++ trunk/src/www/forum/admin/attachments.php	2010-09-21 10:06:11 UTC (rev 10582)
@@ -1,35 +1,29 @@
 <?php
-
 /**
- * GForge Forum Attachments Admin Page
+ * Forum Attachments Admin Page
  *
- * Portions Copyright 1999-2001 (c) VA Linux Systems
- * The rest Copyright 2002-2004 (c) GForge Team
- * http://gforge.org/
+ * Copyright 1999-2001 (c) VA Linux Systems
+ * Copyright 2002-2004 (c) GForge Team
+ * Copyright 2005 (c) Daniel Perez
+ * http://fusionforge.org/
  *
- * @version   
+ * This file is part of FusionForge.
  *
- * This file is part of GForge.
- *
- * GForge is free software; you can redistribute it and/or modify
+ * FusionForge is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GForge is distributed in the hope that it will be useful,
+ * FusionForge is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GForge; if not, write to the Free Software
+ * along with FusionForge; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* attachment manager
-	by Daniel Perez - 2005
-*/
-
 require_once('../../env.inc.php');
 require_once $gfcommon.'include/pre.php';
 require_once $gfwww.'forum/include/ForumHTML.class.php';

Modified: trunk/src/www/forum/admin/index.php
===================================================================
--- trunk/src/www/forum/admin/index.php	2010-09-21 07:24:37 UTC (rev 10581)
+++ trunk/src/www/forum/admin/index.php	2010-09-21 10:06:11 UTC (rev 10582)
@@ -1,24 +1,29 @@
 <?php
 /**
- * GForge Forums Facility
+ * Forum Facility
  *
- * Copyright 2002 GForge, LLC
- * http://gforge.org/
+ * Copyright 1999-2001 (c) VA Linux Systems
+ * Copyright 2002-2004 (c) GForge Team
+ * Copyright 2010 (c) Franck Villaume - Capgemini
+ * http://fusionforge.org/
  *
+ * This file is part of FusionForge.
+ *
+ * FusionForge is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * FusionForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FusionForge; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-
-/*
-	Message Forums
-	By Tim Perdue, Sourceforge, 11/99
-
-	Massive rewrite by Tim Perdue 7/2000 (nested/views/save)
-
-	Complete OO rewrite by Tim Perdue 12/2002
-
-	Heavy RBAC changes 3/17/2004
-*/
-
 require_once('../../env.inc.php');
 require_once $gfcommon.'include/pre.php';
 require_once $gfwww.'forum/include/ForumHTML.class.php';
@@ -65,7 +70,7 @@
 		$deleteforum=0;
 	} else if (getStringFromRequest('add_forum')) {
 		if (!form_key_is_valid(getStringFromRequest('form_key'))) {
-			exit_form_double_submit();
+			exit_form_double_submit('forums');
 		}
 
 		if (check_email_available($g, $g->getUnixName() . '-' . getStringFromRequest('forum_name'), $error_msg)) {
@@ -203,9 +208,9 @@
 		// the user cancelled the request, go back to forum
 		//if thread_id is 0, then we came from message.php. else, we came from forum.php
 		if (!$thread_id) {
-			header("Location: /forum/message.php?msg_id=$msg_id");
+            session_redirect('/forum/message.php?msg_id='.$msg_id);
 		} else {
-			header("Location: /forum/forum.php?thread_id=$thread_id&forum_id=$forum_id");
+            session_redirect('/forum/forum.php?thread_id='.$thread_id.'&forum_id='.$forum_id);
 		}
 		exit;
 	} else {
@@ -239,15 +244,15 @@
 		//actually finish editing the message and save the contents
 		$f = new Forum ($fa->GetGroupObject(),$forum_id);
 		if (!$f || !is_object($f)) {
-			exit_error('Error','Error Getting Forum');
+			exit_error(_('Error Getting Forum'),'forums');
 		} elseif ($f->isError()) {
-			exit_error('Error',$f->getErrorMessage());
+			exit_error($f->getErrorMessage(),'forums');
 		}
 		$fm=new ForumMessage($f,$msg_id,false,false);
 		if (!$fm || !is_object($fm)) {
-			exit_error(_('Error'),_('Error getting new forum message'));
+			exit_error(_('Error getting new forum message'),'forums');
 		} elseif ($fm->isError()) {
-			exit_error(_('Error'),$fm->getErrorMessage());
+			exit_error($fm->getErrorMessage(),'forums');
 		}
 		$subject = getStringFromRequest('subject');
 		$body = getStringFromRequest('body');
@@ -265,37 +270,36 @@
 		if ($fm->updatemsg($forum_id,$posted_by,$subject,$body,$post_date,$is_followup_to,$thread_id,$has_followups,$most_recent_date)) {
 			$feedback .= _('Message Edited Successfully');
 		} else {
-			$feedback .= $fm->getErrorMessage();
+			$error_msg .= $fm->getErrorMessage();
 		}
 		forum_header(array('title'=>_('Edit a Message')));
 		echo '<p>'.util_make_link ('/forum/forum.php?forum_id=' . $forum_id, _("Return to the forum")) ;
 		forum_footer(array());
 	} elseif (getStringFromRequest("cancel")) {
 		// the user cancelled the request, go back to forum
-		header("Location: /forum/message.php?msg_id=$msg_id");
-		exit;
+		session_redirect('/forum/message.php?msg_id='.$msg_id);
 	} else { 
 		//print the edit message confirmation
 			
 		$f = new Forum ($fa->GetGroupObject(),$forum_id);
 		if (!$f || !is_object($f)) {
-			exit_error('Error','Error Getting Forum');
+			exit_error(_('Error Getting Forum'),'forums');
 		} elseif ($f->isError()) {
-			exit_error('Error',$f->getErrorMessage());
+			exit_error($f->getErrorMessage(),'forums');
 		}
 			
 		$fm=new ForumMessage($f,$msg_id,false,false);
 		if (!$fm || !is_object($fm)) {
-			exit_error(_('Error'),_('Error Getting ForumMessage'));
+			exit_error(_('Error Getting ForumMessage'),'forums');
 		} elseif ($fm->isError()) {
-			exit_error(_('Error'),$fm->getErrorMessage());
+			exit_error($fm->getErrorMessage(),'forums');
 		}
 			
 		$fh = new ForumHTML($f);
 		if (!$fh || !is_object($fh)) {
-			exit_error(_('Error'),_('Error Getting ForumHTML'));
+			exit_error(_('Error Getting ForumHTML'),'forums');
 		} elseif ($fh->isError()) {
-			exit_error(_('Error'),$fh->getErrorMessage());
+			exit_error($fh->getErrorMessage(),'forums');
 		}
 			
 		forum_header(array('title'=>_('Edit a Message')));
@@ -319,29 +323,29 @@
 			// Move message in another forum
 			$f_from = new Forum ($fa->GetGroupObject(),$forum_id);
 			if (!$f_from || !is_object($f_from)) {
-				exit_error('Error','Could Not Get Forum Object');
+				exit_error(_('Could Not Get Forum Object'),'forums');
 			} elseif ($f_from->isError()) {
-				exit_error('Error',$f_from->getErrorMessage());
+				exit_error($f_from->getErrorMessage(),'forums');
 			}
 			$f_to = new Forum ($fa->GetGroupObject(),$new_forum_id);
 			if (!$f_to || !is_object($f_to)) {
-				exit_error('Error','Could Not Get Forum Object');
+				exit_error(_('Could Not Get Forum Object'),'forums');
 			} elseif ($f_to->isError()) {
-				exit_error('Error',$f_to->getErrorMessage());
+				exit_error($f_to->getErrorMessage(),'forums');
 			}
 
 			$ff = new ForumFactory($g);
 			if (!$ff || !is_object($ff) || $ff->isError()) {
-				exit_error(_('Error'),$ff->getErrorMessage());
+				exit_error($ff->getErrorMessage(),'forums');
 			}
 
 			if ($ff->moveThread($new_forum_id,$thread_id,$forum_id)) {
 				$feedback .= sprintf(_('Thread successfully moved from %1$s forum to %2$s forum'), $f_from->getName(),$f_to->getName());
 			} else {
-				$feedback .= $ff->getErrorMessage();
+				$error_msg .= $ff->getErrorMessage();
 			}
 		}
-					
+
 		forum_header(array('title'=>_('Edit a Message')));
 		echo '<p><a href="/forum/forum.php?forum_id=' . $new_forum_id . '">Return to the forum</a></p>';
 		echo '<p><a href="/forum/forum.php?thread_id='.$thread_id.'&amp;forum_id=' . $new_forum_id . '">Return to the thread</a></p>';
@@ -349,26 +353,26 @@
 	} elseif (getStringFromRequest("cancel")) {
 		// the user cancelled the request, go back to forum
 		if ($return_to_message) {
-			header("Location: /forum/message.php?msg_id=$msg_id");
+			session_redirect('/forum/message.php?msg_id='.$msg_id);
 		} else {
-			header("Location: /forum/forum.php?thread_id=$thread_id&forum_id=$forum_id");
+			session_redirect('/forum/forum.php?thread_id='.$thread_id.'&forum_id='.$forum_id);
 		}
 		exit;
 	} else { 
 		// Display select box to select new forum
-					
+
 		forum_header(array('title'=>_('Forums: Administration')));
 					
 		$ff = new ForumFactory($g);
 		if (!$ff || !is_object($ff) || $ff->isError()) {
-			exit_error(_("Error"),$ff->getErrorMessage());
+			exit_error($ff->getErrorMessage(),'forums');
 		}
 
 		$farr =& $ff->getForums();
 
 		if ($ff->isError()) {
 			echo '<h1>'.sprintf(_('No Forums Found For %s'), $g->getPublicName()) .'</h1>';
-			echo $ff->getErrorMessage();
+			echo '<div class="error">'.$ff->getErrorMessage().'</div>';
 			forum_footer(array());
 			exit;
 		}
@@ -390,9 +394,9 @@
 					
 		$f_from = new Forum ($fa->GetGroupObject(),$forum_id);
 		if (!$f_from || !is_object($f_from)) {
-			exit_error('Error','Could Not Get Forum Object');
+			exit_error(_('Could Not Get Forum Object'),'forums');
 		} elseif ($f_from->isError()) {
-			exit_error('Error',$f_from->getErrorMessage());
+			exit_error($f_from->getErrorMessage(),'forums');
 		}
 					
 		echo '<center>
@@ -437,14 +441,14 @@
 	//
 	$ff=new ForumFactory($g);
 	if (!$ff || !is_object($ff) || $ff->isError()) {
-		exit_error(_('Error'),$ff->getErrorMessage());
+		exit_error($ff->getErrorMessage(),'forums');
 	}
 
 	$farr =& $ff->getForumsAdmin();
 
 	if ($ff->isError()) {
 		echo '<h1>'.sprintf(_('No Forums Found For %1$s'), $g->getPublicName()) .'</h1>';
-		echo $ff->getErrorMessage();
+		echo '<div class="error">'.$ff->getErrorMessage().'</div>';
 		forum_footer(array());
 		exit;
 	}

Modified: trunk/src/www/forum/admin/monitor.php
===================================================================
--- trunk/src/www/forum/admin/monitor.php	2010-09-21 07:24:37 UTC (rev 10581)
+++ trunk/src/www/forum/admin/monitor.php	2010-09-21 10:06:11 UTC (rev 10582)
@@ -1,24 +1,29 @@
 <?php
 /**
- * GForge Forums Facility
+ * Forum Facility
  *
- * Copyright 2002 GForge, LLC
- * http://gforge.org/
+ * Copyright 1999-2001 (c) Tim Perdue - VA Linux Systems
+ * Copyright 2002-2004 (c) GForge Team
+ * Copyright 2010 (c) Franck Villaume - Capgemini
+ * http://fusionforge.org/
  *
+ * This file is part of FusionForge.
+ *
+ * FusionForge is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * FusionForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FusionForge; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-
-/*
-	Message Forums
-	By Tim Perdue, Sourceforge, 11/99
-
-	Massive rewrite by Tim Perdue 7/2000 (nested/views/save)
-
-	Complete OO rewrite by Tim Perdue 12/2002
-
-	Heavy RBAC changes 3/17/2004
-*/
-
 require_once('../../env.inc.php');
 require_once $gfcommon.'include/pre.php';
 require_once $gfwww.'forum/include/ForumHTML.class.php';
@@ -34,9 +39,9 @@
 $g=group_get_object($group_id);
 $f = new Forum ($g,$group_forum_id);
 if (!$f || !is_object($f)) {
-	exit_error('Error','Could Not Get Forum Object');
+	exit_error(_('Could Not Get Forum Object'),'forums');
 } elseif ($f->isError()) {
-	exit_error('Error',$f->getErrorMessage());
+	exit_error($f->getErrorMessage(),'forums');
 }
 
 session_require_perm ('forum_admin', $f->Group->getID()) ;

Modified: trunk/src/www/forum/admin/pending.php
===================================================================
--- trunk/src/www/forum/admin/pending.php	2010-09-21 07:24:37 UTC (rev 10581)
+++ trunk/src/www/forum/admin/pending.php	2010-09-21 10:06:11 UTC (rev 10582)
@@ -1,35 +1,30 @@
 <?php
 
 /**
- * GForge Forum Pending Messages Management Admin Page
+ * Forum Pending Messages Management Admin Page
  *
- * Portions Copyright 1999-2001 (c) VA Linux Systems
- * The rest Copyright 2002-2004 (c) GForge Team
- * http://gforge.org/
+ * Copyright 1999-2001 (c) VA Linux Systems
+ * Copyright 2002-2004 (c) GForge Team
+ * Copyright 2005 (c) Daniel Perez
+ * http://fusionforge.org/
  *
- * @version   
+ * This file is part of FusionForge.
  *
- * This file is part of GForge.
- *
- * GForge is free software; you can redistribute it and/or modify
+ * FusionForge is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GForge is distributed in the hope that it will be useful,
+ * FusionForge is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GForge; if not, write to the Free Software
+ * along with FusionForge; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* message moderation
-	by Daniel Perez - 2005
-*/
-
 require_once('../../env.inc.php');
 require_once $gfcommon.'include/pre.php';
 require_once $gfwww.'forum/include/ForumHTML.class.php';
@@ -67,7 +62,4 @@
 	}
 	forum_footer(array());
 }
-
-
-
 ?>

Modified: trunk/src/www/forum/admin/pendingmsgdetail.php
===================================================================
--- trunk/src/www/forum/admin/pendingmsgdetail.php	2010-09-21 07:24:37 UTC (rev 10581)
+++ trunk/src/www/forum/admin/pendingmsgdetail.php	2010-09-21 10:06:11 UTC (rev 10582)
@@ -1,35 +1,29 @@
 <?php
-
 /**
- * GForge Forum Pending Messages Detail
+ * Forum Pending Messages Detail
  *
- * Portions Copyright 1999-2001 (c) VA Linux Systems
- * The rest Copyright 2002-2004 (c) GForge Team
- * http://gforge.org/
+ * Copyright 1999-2001 (c) VA Linux Systems
+ * Copyright 2002-2004 (c) GForge Team
+ * Copyright 2005 (c) Daniel Perez
+ * http://fusionforge.org/
  *
- * @version   
+ * This file is part of FusionForge.
  *
- * This file is part of GForge.
- *
- * GForge is free software; you can redistribute it and/or modify
+ * FusionForge is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GForge is distributed in the hope that it will be useful,
+ * FusionForge is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GForge; if not, write to the Free Software
+ * along with FusionForge; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* message moderation
-	by Daniel Perez - 2005
-*/
-
 require_once('../../env.inc.php');
 require_once $gfcommon.'include/pre.php';
 require_once $gfwww.'forum/include/ForumHTML.class.php';
@@ -46,13 +40,12 @@
 $fa = new ForumAdmin($group_id);
 
 if ( (!$forum_id) || (!$group_id) || (!$msg_id) ) {
-	exit_missing_param();
+	exit_missing_param('',array(_('Forum ID'),_('Project ID'),_('Message ID')),'forums');
 }
 
 session_require_perm ('forum', $group_id, 'moderate') ;
 
 //print the message
-forum_header(array());
 $g =& $fa->GetGroupObject();
 $f=new Forum($g,$forum_id);
 if (!$f || !is_object($f)) {
@@ -62,16 +55,17 @@
 }
 $fm = new ForumMessage($f,$msg_id,false,true); //create the pending message
 if (!$fm || !is_object($fm)) {
-	exit_error(_('Error'), "Error getting new ForumMessage");
+	exit_error(_('Error getting new ForumMessage'),'forums');
 } elseif ($fm->isError()) {
-	exit_error(_('Error'),"Error getting new ForumMessage: ".$fm->getErrorMessage());
+	exit_error(_('Error getting new ForumMessage: ').$fm->getErrorMessage(),'forums');
 }
 $fhtml = new ForumHTML($f);
 if (!$fhtml || !is_object($fhtml)) {
-	exit_error(_('Error'), "Error getting new ForumHTML");
+	exit_error(_('Error getting new ForumHTML'),'forums');
 } elseif ($fhtml->isError()) {
-	exit_error(_('Error'),$fhtml->getErrorMessage());
+	exit_error($fhtml->getErrorMessage(),'forums');
 }
+forum_header(array());
 echo $fhtml->showPendingMessage($fm);
 $HTML->footer(array());
 

Modified: trunk/src/www/frs/admin/showreleases.php
===================================================================
--- trunk/src/www/frs/admin/showreleases.php	2010-09-21 07:24:37 UTC (rev 10581)
+++ trunk/src/www/frs/admin/showreleases.php	2010-09-21 10:06:11 UTC (rev 10582)
@@ -49,16 +49,16 @@
 if (!$project || !is_object($project)) {
     exit_no_group();
 } elseif ($project->isError()) {
-	exit_error('Error',$project->getErrorMessage());
+	exit_error($project->getErrorMessage(),'frs');
 }
 
 session_require_perm ('frs', $group_id, 'write') ;
 
 $frsp = new FRSPackage($project,$package_id);
 if (!$frsp || !is_object($frsp)) {
-	exit_error('Error','Could Not Get FRS Package');
+	exit_error(_('Could Not Get FRS Package'),'frs');
 } elseif ($frsp->isError()) {
-	exit_error('Error',$frsp->getErrorMessage());
+	exit_error($frsp->getErrorMessage(),'frs');
 }
 
 //
@@ -72,12 +72,12 @@
 
 	$frsr = new FRSRelease($frsp,$release_id);
 	if (!$frsr || !is_object($frsr)) {
-		exit_error('Error','Could Not Get FRS Release');
+		exit_error(_('Could Not Get FRS Release'),'frs');
 	} elseif ($frsr->isError()) {
-		exit_error('Error',$frsr->getErrorMessage());
+		exit_error($frsr->getErrorMessage(),'frs');
 	}
 	if (!$frsr->delete($sure,$really_sure)) {
-		exit_error('Error',$frsr->getErrorMessage());
+		exit_error($frsr->getErrorMessage(),'frs');
 	} else {
 		$feedback .= _('Deleted');
 	}
@@ -88,7 +88,7 @@
 */
 $rs =& $frsp->getReleases();
 if (count($rs) < 1) {
-	exit_error(_('Error'),_('No Releases Of This Package Are Available'));
+	exit_error(_('No Releases Of This Package Are Available'),'frs');
 }
 
 /*

Modified: trunk/src/www/frs/index.php
===================================================================
--- trunk/src/www/frs/index.php	2010-09-21 07:24:37 UTC (rev 10581)
+++ trunk/src/www/frs/index.php	2010-09-21 10:06:11 UTC (rev 10582)
@@ -3,23 +3,24 @@
  * Project File Information/Download Page
  *
  * Copyright 1999-2001 (c) VA Linux Systems
- * The rest Copyright 2002-2004 (c) GForge Team
- * http://gforge.org/
+ * Copyright 2002-2004 (c) GForge Team
+ * Copyright 2010 (c) FusionForge Team
+ * http://fusionforge.org/
  *
- * This file is part of GForge.
+ * This file is part of FusionForge.
  *
- * GForge is free software; you can redistribute it and/or modify
+ * FusionForge is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GForge is distributed in the hope that it will be useful,
+ * FusionForge is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GForge; if not, write to the Free Software
+ * along with FusionForge; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
@@ -34,7 +35,7 @@
 $cur_group =& group_get_object($group_id);
 
 if (!$cur_group) {
-	exit_error(_('No group title'), _('No group'));
+	exit_no_group();
 }
 
 //
@@ -67,7 +68,7 @@
 
 if ( $num_packages < 1) {
 	echo "<h1>"._('No File Packages')."</h1>";
-	echo "<p><strong>"._('There are no file packages defined for this project.')."</strong>";
+	echo "<div class='warning'>"._('There are no file packages defined for this project.')."</div>";
 } else {
 	echo '<div id="forge-frs" class="underline-link">'."\n";
 
@@ -125,7 +126,7 @@
 		$proj_stats['releases'] += $num_releases;
 
 		if ( !$res_release || $num_releases < 1 ) {
-			echo '<strong>' . _('No releases') . '</strong>
+			echo '<div class="warning">' . _('No releases') . '</div>
 			';
 		} else {
 			// iterate and show the releases of the package

Modified: trunk/src/www/frs/monitor.php
===================================================================
--- trunk/src/www/frs/monitor.php	2010-09-21 07:24:37 UTC (rev 10581)
+++ trunk/src/www/frs/monitor.php	2010-09-21 10:06:11 UTC (rev 10582)
@@ -1,10 +1,27 @@
 <?php
 /**
- * GForge FRS Facility
+ * FRS Facility
  *
- * Copyright 2002 GForge, LLC
- * http://gforge.org/
+ * Copyright 1999-2001 (c) VA Linux Systems
+ * Copyright 2002-2004 (c) GForge Team
+ * Copyright 2010 (c) FusionForge Team
+ * http://fusionforge.org/
  *
+ * This file is part of FusionForge.
+ *
+ * FusionForge is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * FusionForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FusionForge; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 require_once('../env.inc.php');
@@ -30,32 +47,31 @@
 
 		$f=new FRSPackage($g,$filemodule_id);
 		if (!$f || !is_object($f)) {
-			exit_error('Error','Error Getting FRSPackage');
+			exit_error(_('Error Getting FRSPackage'),'frs');
 		} elseif ($f->isError()) {
-			exit_error('Error',$f->getErrorMessage());
+			exit_error($f->getErrorMessage(),'frs');
 		}
 
 		if ($stop) {
 			if (!$f->stopMonitor()) {
-				exit_error(_('Error'),$f->getErrorMessage());
+				exit_error($f->getErrorMessage(),'frs');
 			} else {
+                $feedback = _('Monitoring Has Been Stopped');
 				frs_header(array('title'=>_('Monitoring stopped'),'group'=>$group_id));
-				echo $HTML->feedback(_('Monitoring Has Been Stopped'));
 				frs_footer();
 			}
 		} elseif($start) {
 			if (!$f->setMonitor()) {
-				exit_error('Error',$f->getErrorMessage());
+				exit_error($f->getErrorMessage(),'frs');
 			} else {
+                $feedback = _('Monitoring Has Been Started');
 				frs_header(array('title'=>_('Monitoring started'),'group'=>$group_id));
-				echo $HTML->feedback(_('Monitoring Has Been Started'));
 				frs_footer();
 			}
 		}
 	} else {
-		exit_missing_param();
+		exit_missing_param('',array(_('Project ID'),_('File Module ID')),'frs');
 	}
-
 } else {
 	exit_not_logged_in();
 }

Modified: trunk/src/www/frs/shownotes.php
===================================================================
--- trunk/src/www/frs/shownotes.php	2010-09-21 07:24:37 UTC (rev 10581)
+++ trunk/src/www/frs/shownotes.php	2010-09-21 10:06:11 UTC (rev 10582)
@@ -3,23 +3,24 @@
  * Show Release Notes/ChangeLog Page
  *
  * Copyright 1999-2001 (c) VA Linux Systems
- * The rest Copyright 2002-2004 (c) GForge Team
+ * Copyright 2002-2004 (c) GForge Team
+ * Copyright 2010 (c) FusionForge Team
  * http://gforge.org/
  *
- * This file is part of GForge.
+ * This file is part of FusionForge.
  *
- * GForge is free software; you can redistribute it and/or modify
+ * FusionForge is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GForge is distributed in the hope that it will be useful,
+ * FusionForge is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GForge; if not, write to the Free Software
+ * along with FusionForge; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
@@ -37,7 +38,7 @@
 			array($release_id));
 
 if (!$result || db_numrows($result) < 1) {
-	exit_error(_('Error'), _('That Release Was Not Found'));
+	exit_error(_('That Release Was Not Found'),'frs');
 } else {
 
 	$group_id=db_result($result,0,'group_id');

Modified: trunk/src/www/tracker/admin/form-addextrafield.php
===================================================================
--- trunk/src/www/tracker/admin/form-addextrafield.php	2010-09-21 07:24:37 UTC (rev 10581)
+++ trunk/src/www/tracker/admin/form-addextrafield.php	2010-09-21 10:06:11 UTC (rev 10582)
@@ -11,7 +11,7 @@
 		/*
 			List of possible user built Selection Boxes for an ArtifactType
 		*/
-		$efarr =& $ath->getExtraFields();
+		$efarr = $ath->getExtraFields();
 		$eftypes=ArtifactExtraField::getAvailableTypes();
 		$keys=array_keys($efarr);
 		echo "<br />";
@@ -120,7 +120,7 @@
 			<input type="text" name="attribute2" value="80" size="2" maxlength="2" />
 		</p>
 		<p>
-		<span class="warning"><?php echo _('Warning: this add new custom field') ?></span>
+		<div class="warning"><?php echo _('Warning: this add new custom field') ?></div>
 		</p>
 		<p>
 		<input type="submit" name="post_changes" value="<?php echo _('Submit') ?>" />

Modified: trunk/src/www/tracker/admin/form-addextrafieldoption.php
===================================================================
--- trunk/src/www/tracker/admin/form-addextrafieldoption.php	2010-09-21 07:24:37 UTC (rev 10581)
+++ trunk/src/www/tracker/admin/form-addextrafieldoption.php	2010-09-21 10:06:11 UTC (rev 10582)
@@ -82,7 +82,7 @@
 		<?php } ?>
 		&nbsp;&nbsp;<input type="submit" name="post_changes" value="<?php echo _('Submit') ?>" />
 		<br />
-		<span class="warning"><?php echo _('Once you add a new element, it cannot be deleted') ?></span>
+		<div class="warning"><?php echo _('Once you add a new element, it cannot be deleted') ?></div>
 		</form>
 		<br />
 		<?php

Modified: trunk/src/www/tracker/admin/form-updateextrafield.php
===================================================================
--- trunk/src/www/tracker/admin/form-updateextrafield.php	2010-09-21 07:24:37 UTC (rev 10581)
+++ trunk/src/www/tracker/admin/form-updateextrafield.php	2010-09-21 10:06:11 UTC (rev 10582)
@@ -1,4 +1,26 @@
 <?php
+/**
+ * Tracker Facility
+ *
+ * Copyright 2010 (c) FusionForge Team
+ * http://fusionforge.org
+ *
+ * This file is part of FusionForge. FusionForge is free software;
+ * you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the Licence, or (at your option)
+ * any later version.
+ *
+ * FusionForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with FusionForge; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 //
 //  FORM TO UPDATE POP-UP BOXES
 //
@@ -50,10 +72,9 @@
 			<input type="text" name="alias" value="<?php echo $ac->getAlias(); ?>" />
 			</p>
 			<p><input type="checkbox" name="is_required" <?php if ($ac->isRequired()) echo "checked=\"checked\""; ?> /><?php echo _('Field is mandatory')?></p>
+			<div class="warning"><?php echo _('It is not recommended that you change the custom field name because other things are dependent upon it. When you change the custom field name, all related items will be changed to the new name') ?>
+			</div>
 			<p>
-			<span class="warning"><?php echo _('It is not recommended that you change the custom field name because other things are dependent upon it. When you change the custom field name, all related items will be changed to the new name') ?>
-				</span></p>
-			<p>
 			<input type="submit" name="post_changes" value="<?php echo _('Submit') ?>" /></p>
 			</form>
 			<?php

Modified: trunk/src/www/tracker/admin/form-updateextrafieldelement.php
===================================================================
--- trunk/src/www/tracker/admin/form-updateextrafieldelement.php	2010-09-21 07:24:37 UTC (rev 10581)
+++ trunk/src/www/tracker/admin/form-updateextrafieldelement.php	2010-09-21 10:06:11 UTC (rev 10582)
@@ -42,10 +42,9 @@
 			<?php echo $ath->statusBox('status_id',$ao->getStatusID(),false,false); ?>
 			<?php } ?>
 
+			<div class="warning"><?php echo _('It is not recommended that you change the custom field name because other things are dependent upon it. When you change the custom field name, all related items will be changed to the new name') ?>
+			</div>
 			<p>
-			<span class="warning"><?php echo _('It is not recommended that you change the custom field name because other things are dependent upon it. When you change the custom field name, all related items will be changed to the new name') ?>
-				</span></p>
-			<p>
 			<input type="submit" name="post_changes" value="<?php echo _('Submit') ?>" /></p>
 			</form>
 			<?php

Modified: trunk/src/www/tracker/admin/index.php
===================================================================
--- trunk/src/www/tracker/admin/index.php	2010-09-21 07:24:37 UTC (rev 10581)
+++ trunk/src/www/tracker/admin/index.php	2010-09-21 10:06:11 UTC (rev 10582)
@@ -38,8 +38,8 @@
 
 $group_id = getIntFromRequest('group_id');
 $atid = getIntFromRequest('atid');
+$feedback = getStringFromRequest('feedback');
 
-$feedback = '';
 $add_extrafield = '';
 
 $group =& group_get_object($group_id);

Modified: trunk/src/www/tracker/admin/updates.php
===================================================================
--- trunk/src/www/tracker/admin/updates.php	2010-09-21 07:24:37 UTC (rev 10581)
+++ trunk/src/www/tracker/admin/updates.php	2010-09-21 10:06:11 UTC (rev 10582)
@@ -1,4 +1,26 @@
 <?php
+/**
+ * Tracker Facility
+ *
+ * Copyright 2010 (c) FusionForge Team
+ * http://fusionforge.org
+ *
+ * This file is part of FusionForge. FusionForge is free software;
+ * you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the Licence, or (at your option)
+ * any later version.
+ *
+ * FusionForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with FusionForge; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 		//
 		//	Create an extra field
 		//




More information about the Fusionforge-commits mailing list