Removed unused constants & functions and added new comment insert err…

…or message
Dolibarr · Jan 5, 2014 · ef44db8 · ef44db8
1 parent b68f5b6
commit ef44db8
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 35 deletions.
diff --git a/htdocs/langs/en_US/opensurvey.lang b/htdocs/langs/en_US/opensurvey.lang
@@ -65,4 +65,5 @@ BackToCurrentMonth=Back to current month
 ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation
 ErrorOpenSurveyOneChoice=Enter at least one choice
 ErrorOpenSurveyDateFormat=Date must be have the format DD/MM/YYYY
+ErrorInsertingComment=There was an error while inserting your comment
 MoreChoices=Enter more choices for the voters
diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
@@ -130,7 +130,7 @@
 
 		if (! $resql)
 		{
-			$err |= COMMENT_INSERT_FAILED;
+			setEventMessage($langs->trans('ErrorInsertingComment'), 'errors');
 		}
 	}
 }

diff --git a/htdocs/opensurvey/fonctions.php b/htdocs/opensurvey/fonctions.php
@@ -144,24 +144,6 @@ function get_server_name()
 	return $url;
 }
 
-
-/**
- * is_error
- *
- * @param unknown_type $cerr error number
- * @return 	boolean				Error key found or not
- */
-function is_error($cerr)
-{
-	global $err;
-	if ( $err == 0 ) {
-		return false;
-	}
-
-	return (($err & $cerr) != 0 );
-}
-
-
 /**
  * Fonction vérifiant l'existance et la valeur non vide d'une clé d'un tableau
  *
@@ -264,18 +246,4 @@ function ajouter_sondage()
 	exit();
 }
 
-
-
-define('COMMENT_EMPTY',         0x0000000001);
-define('COMMENT_USER_EMPTY',    0x0000000010);
-define('COMMENT_INSERT_FAILED', 0x0000000100);
-define('NAME_EMPTY',            0x0000001000);
-define('NAME_TAKEN',            0x0000010000);
-define('NO_POLL',               0x0000100000);
-define('NO_POLL_ID',            0x0001000000);
-define('INVALID_EMAIL',         0x0010000000);
-define('TITLE_EMPTY',           0x0100000000);
-define('INVALID_DATE',          0x1000000000);
-$err = 0;
-
 ?>
diff --git a/htdocs/opensurvey/public/studs.php b/htdocs/opensurvey/public/studs.php
@@ -546,7 +546,7 @@
 		if (empty($listofanswers[$i]['format']) || ! in_array($listofanswers[$i]['format'],array('yesno','foragainst')))
 		{
 			print '<input type="checkbox" name="choix'.$i.'" value="1"';
-			if (isset($_POST['choix'.$i]) && $_POST['choix'.$i] == '1' && is_error(NAME_EMPTY) )
+			if (isset($_POST['choix'.$i]) && $_POST['choix'.$i] == '1')
 			{
 				print ' checked="checked"';
 			}

diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
@@ -899,7 +899,7 @@
 		if (empty($listofanswers[$i]['format']) || ! in_array($listofanswers[$i]['format'],array('yesno','foragainst')))
 		{
 			print '<input type="checkbox" name="choix'.$i.'" value="1"';
-			if ( isset($_POST['choix'.$i]) && $_POST['choix'.$i] == '1' && is_error(NAME_EMPTY) )
+			if ( isset($_POST['choix'.$i]) && $_POST['choix'.$i] == '1' )
 			{
 				print ' checked="checked"';
 			}