[Fusionforge-commits] r10636 - in trunk/src/www: account people project/admin survey/include

Franck VILLAUME nerville at libremir.placard.fr.eu.org
Wed Sep 22 18:02:22 CEST 2010


Author: nerville
Date: 2010-09-22 18:02:20 +0200 (Wed, 22 Sep 2010)
New Revision: 10636

Modified:
   trunk/src/www/account/register.php
   trunk/src/www/people/editprofile.php
   trunk/src/www/project/admin/users.php
   trunk/src/www/survey/include/SurveyHTML.class.php
Log:
warning -> warning_msg

Modified: trunk/src/www/account/register.php
===================================================================
--- trunk/src/www/account/register.php	2010-09-22 15:53:07 UTC (rev 10635)
+++ trunk/src/www/account/register.php	2010-09-22 16:02:20 UTC (rev 10636)
@@ -72,7 +72,7 @@
 	}
 	
 	if ($GLOBALS['sys_require_accept_conditions'] && ! $accept_conditions) {
-		$warning = _("You can't register an account unless you accept the terms of use.") ;
+		$warning_msg = _("You can't register an account unless you accept the terms of use.") ;
 	} else {
 		$new_user = new GFUser();
 		$register = $new_user->create($unix_name,$firstname,$lastname,$password1,$password2,
@@ -85,18 +85,18 @@
 			echo $HTML->footer(array());
 			exit;
 		} else {
-			$error = $new_user->getErrorMessage();
+			$error_msg = $new_user->getErrorMessage();
 		}
 	}
 }
 
 $HTML->header(array('title'=>'User Account Registration'));
 
-if (!empty($error))
-	print "<div class='error'>$error</div>";
+if (!empty($error_msg))
+	print "<div class='error'>$error_msg</div>";
 
 if (!empty($warning))
-	print "<div class='warning'>$warning</div>";
+	print "<div class='warning_msg'>$warning_msg</div>";
 
 if (!isset($timezone) || empty($timezone) || !preg_match('/^[-a-zA-Z0-9_\/\.+]+$/', $timezone)) {
 	$timezone = forge_get_config('default_timezone') ? forge_get_config('default_timezone') : 'GMT' ;

Modified: trunk/src/www/people/editprofile.php
===================================================================
--- trunk/src/www/people/editprofile.php	2010-09-22 15:53:07 UTC (rev 10635)
+++ trunk/src/www/people/editprofile.php	2010-09-22 16:02:20 UTC (rev 10636)
@@ -36,7 +36,7 @@
 $group_id = getIntFromRequest('group_id');
 $job_id = getStringFromRequest('job_id');
 $feedback = '';
-$warning = '';
+$warning_msg = '';
 $error_msg = '';
 
 if (session_loggedin()) {
@@ -126,7 +126,7 @@
 			$numItems = count($skill_edit);
 		}
 		if($numItems == 0) {
-			$warning .= _('No skills selected to edit.');
+			$warning_msg .= _('No skills selected to edit.');
 		} else {
 			if (getStringFromRequest('confirmMultiEdit')) {
 				if (!form_key_is_valid(getStringFromRequest('form_key'))) {
@@ -166,7 +166,7 @@
 			}
 		}
 	} else if (getStringFromRequest('cancelMultiEdit')) {
-		$warning = _('Cancelled skills update');
+		$warning_msg = _('Cancelled skills update');
 	}
 	
 	if (getStringFromRequest('MultiDelete')) {
@@ -179,7 +179,7 @@
 		}
 		$numItems = count($skill_delete);
 		if($numItems == 0) {
-			$warning .= _('No skills selected to delete.');
+			$warning_msg .= _('No skills selected to delete.');
 		} else {
 			if(getStringFromRequest('confirmMultiDelete')) {
 				if (!form_key_is_valid(getStringFromRequest('form_key'))) {
@@ -227,7 +227,7 @@
 			
 		}
 	} elseif (getStringFromRequest('MultiDeleteCancel')) {
-		$warning .= _('Skill deletion cancelled');
+		$warning_msg .= _('Skill deletion cancelled');
 	}
 
 	people_header(array('title'=>_('Edit Your Profile')));

Modified: trunk/src/www/project/admin/users.php
===================================================================
--- trunk/src/www/project/admin/users.php	2010-09-22 15:53:07 UTC (rev 10635)
+++ trunk/src/www/project/admin/users.php	2010-09-22 16:02:20 UTC (rev 10636)
@@ -64,11 +64,11 @@
 		$form_unix_name = getStringFromRequest('form_unix_name');
 		$user_object = &user_get_object_by_name($form_unix_name);
 		if ($user_object === false) {
-			$warning .= _('No Matching Users Found');
+			$warning_msg .= _('No Matching Users Found');
 		} else {
 			$role_id = getIntFromRequest('role_id');
 			if (!$role_id) {
-				$warning .= _('Role not selected');
+				$warning_msg .= _('Role not selected');
 			} else {
 				$user_id = $user_object->getID();
 				if (!$group->addUser($form_unix_name,$role_id)) {

Modified: trunk/src/www/survey/include/SurveyHTML.class.php
===================================================================
--- trunk/src/www/survey/include/SurveyHTML.class.php	2010-09-22 15:53:07 UTC (rev 10635)
+++ trunk/src/www/survey/include/SurveyHTML.class.php	2010-09-22 16:02:20 UTC (rev 10636)
@@ -113,7 +113,7 @@
 		/* If we have a question object, it is a Modify */
 		if ($q && is_object($q) && !$q->isError() && $q->getID()) {
 			$title = _('Edit A Question');
-			$warning = '<div class="warning">'. 
+			$warning_msg = '<div class="warning">'. 
 				_('WARNING! It is a bad idea to change a question after responses to it have been submitted').
 				'</div>';
 			$question_id = $q->getID();
@@ -121,14 +121,14 @@
 			$question_type = $q->getQuestionType();
 			$question_button = _('Submit Changes');
 		} else {
-			$warning = '';
+			$warning_msg = '';
 			$question = '';
 			$question_id = '';
 			$question_type = '';
 		}
 
 		$ret = '<h1>'. $title. '</h1>';
-		$ret.= $warning;
+		$ret.= $warning_msg;
 		$ret.='<form action="'.getStringFromServer('PHP_SELF').'" method="post">';
 		$ret.='<p><input type="hidden" name="post" value="Y" />';
 		$ret.='<input type="hidden" name="group_id" value="'.$group_id.'" />';
@@ -175,7 +175,7 @@
 		/* If we have a survey object, it is a Modify */
 		if ($s && is_object($s) && !$s->isError() && $s->getID()) {
 			$title = _('Edit A Survey');
-			$warning = '<div class="warning">'. 
+			$warning_msg = '<div class="warning">'. 
 				_('WARNING! It is a bad idea to edit a survey after responses have been posted').'</div>';
 			$survey_id = $s->getID();
 			$survey_title = $s->getTitle();
@@ -186,13 +186,13 @@
 				$active ='';
 			}
 		} else {
-			$warning = '';
+			$warning_msg = '';
 			$survey_questions = ''; 
 			$survey_title = ''; 
 		}
 
 		$ret = '<h1>'. $title. '</h1>';
-		$ret.= $warning;
+		$ret.= $warning_msg;
 		$ret.='<form action="'.getStringFromServer('PHP_SELF').'" method="post">';
 		$ret.='<input type="hidden" name="post" value="Y" />';
 		$ret.='<input type="hidden" name="group_id" value="'.$group_id.'" />';




More information about the Fusionforge-commits mailing list