Dolibarr / dolibarr

htdocs/public/agenda/agendaexport.php

Spacing +58 added lines, -58 removed lines

@@ -32,12 +32,12 @@ 
 //if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
 //if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
 //if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-define("NOLOGIN",1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no menu to show
+if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+define("NOLOGIN", 1); // This means this output page does not require to be logged.
+define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
 
 // C'est un wrapper, donc header vierge
 /**
@@ -57,27 +57,27 @@ 
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
 // Security check
-if (empty($conf->agenda->enabled)) accessforbidden('',0,0,1);
+if (empty($conf->agenda->enabled)) accessforbidden('', 0, 0, 1);
 
 // Not older than
-if (! isset($conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY)) $conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY=100;	// default limit
+if (!isset($conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY)) $conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY = 100; // default limit
 
 // Define format, type and filter
-$format='ical';
-$type='event';
-if (GETPOST("format",'alpha')) $format=GETPOST("format",'apha');
-if (GETPOST("type",'apha'))   $type=GETPOST("type",'alpha');
-
-$filters=array();
-if (GETPOST("year",'int')) 	        $filters['year']=GETPOST("year",'int');
-if (GETPOST("id",'int'))            $filters['id']=GETPOST("id",'int');
-if (GETPOST("idfrom",'int'))        $filters['idfrom']=GETPOST("idfrom",'int');
-if (GETPOST("idto",'int'))          $filters['idto']=GETPOST("idto",'int');
-if (GETPOST("project",'apha'))      $filters['project']=GETPOST("project",'apha');
-if (GETPOST("logina",'apha'))       $filters['logina']=GETPOST("logina",'apha');
-if (GETPOST("logint",'apha'))       $filters['logint']=GETPOST("logint",'apha');
-if (GETPOST("notolderthan",'int'))  $filters['notolderthan']=GETPOST("notolderthan","int");
-else $filters['notolderthan']=$conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY;
+$format = 'ical';
+$type = 'event';
+if (GETPOST("format", 'alpha')) $format = GETPOST("format", 'apha');
+if (GETPOST("type", 'apha'))   $type = GETPOST("type", 'alpha');
+
+$filters = array();
+if (GETPOST("year", 'int')) 	        $filters['year'] = GETPOST("year", 'int');
+if (GETPOST("id", 'int'))            $filters['id'] = GETPOST("id", 'int');
+if (GETPOST("idfrom", 'int'))        $filters['idfrom'] = GETPOST("idfrom", 'int');
+if (GETPOST("idto", 'int'))          $filters['idto'] = GETPOST("idto", 'int');
+if (GETPOST("project", 'apha'))      $filters['project'] = GETPOST("project", 'apha');
+if (GETPOST("logina", 'apha'))       $filters['logina'] = GETPOST("logina", 'apha');
+if (GETPOST("logint", 'apha'))       $filters['logint'] = GETPOST("logint", 'apha');
+if (GETPOST("notolderthan", 'int'))  $filters['notolderthan'] = GETPOST("notolderthan", "int");
+else $filters['notolderthan'] = $conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY;
 
 // Check config
 if (empty($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY))
@@ -103,64 +103,64 @@ 
 
 
 // Define filename with prefix on filters predica (each predica set must have on cache file)
-$shortfilename='dolibarrcalendar';
-$filename=$shortfilename;
+$shortfilename = 'dolibarrcalendar';
+$filename = $shortfilename;
 // Complete long filename
 foreach ($filters as $key => $value)
 {
     //if ($key == 'notolderthan')    $filename.='-notolderthan'.$value; This filter key is already added before and does not need to be in filename
-	if ($key == 'year')            $filename.='-year'.$value;
-    if ($key == 'id')              $filename.='-id'.$value;
-    if ($key == 'idfrom')          $filename.='-idfrom'.$value;
-    if ($key == 'idto')            $filename.='-idto'.$value;
-    if ($key == 'project')         $filename.='-project'.$value;
-	if ($key == 'logina')	       $filename.='-logina'.$value;	// Author
-	if ($key == 'logint')	       $filename.='-logint'.$value;	// Assigned to
+	if ($key == 'year')            $filename .= '-year'.$value;
+    if ($key == 'id')              $filename .= '-id'.$value;
+    if ($key == 'idfrom')          $filename .= '-idfrom'.$value;
+    if ($key == 'idto')            $filename .= '-idto'.$value;
+    if ($key == 'project')         $filename .= '-project'.$value;
+	if ($key == 'logina')	       $filename .= '-logina'.$value; // Author
+	if ($key == 'logint')	       $filename .= '-logint'.$value; // Assigned to
 }
 // Add extension
-if ($format == 'vcal') { $shortfilename.='.vcs'; $filename.='.vcs'; }
-if ($format == 'ical') { $shortfilename.='.ics'; $filename.='.ics'; }
-if ($format == 'rss')  { $shortfilename.='.rss'; $filename.='.rss'; }
+if ($format == 'vcal') { $shortfilename .= '.vcs'; $filename .= '.vcs'; }
+if ($format == 'ical') { $shortfilename .= '.ics'; $filename .= '.ics'; }
+if ($format == 'rss') { $shortfilename .= '.rss'; $filename .= '.rss'; }
 
-if ($shortfilename=='dolibarrcalendar')
+if ($shortfilename == 'dolibarrcalendar')
 {
 	$langs->load("main");
 	$langs->load("errors");
 	llxHeaderVierge();
-    print '<div class="error">'.$langs->trans("ErrorWrongValueForParameterX",'format').'</div>';
+    print '<div class="error">'.$langs->trans("ErrorWrongValueForParameterX", 'format').'</div>';
 	llxFooterVierge();
 	exit;
 }
 
-$agenda=new ActionComm($db);
+$agenda = new ActionComm($db);
 
-$cachedelay=0;
-if (! empty($conf->global->MAIN_AGENDA_EXPORT_CACHE)) $cachedelay=$conf->global->MAIN_AGENDA_EXPORT_CACHE;
+$cachedelay = 0;
+if (!empty($conf->global->MAIN_AGENDA_EXPORT_CACHE)) $cachedelay = $conf->global->MAIN_AGENDA_EXPORT_CACHE;
 
 // Build file
 if ($format == 'ical' || $format == 'vcal')
 {
-	$result=$agenda->build_exportfile($format,$type,$cachedelay,$filename,$filters);
+	$result = $agenda->build_exportfile($format, $type, $cachedelay, $filename, $filters);
 	if ($result >= 0)
 	{
 		$attachment = true;
-		if (isset($_GET["attachment"])) $attachment=$_GET["attachment"];
+		if (isset($_GET["attachment"])) $attachment = $_GET["attachment"];
 		//$attachment = false;
-		$contenttype='text/calendar';
-		if (isset($_GET["contenttype"])) $contenttype=$_GET["contenttype"];
+		$contenttype = 'text/calendar';
+		if (isset($_GET["contenttype"])) $contenttype = $_GET["contenttype"];
 		//$contenttype='text/plain';
-		$outputencoding='UTF-8';
+		$outputencoding = 'UTF-8';
 
-		if ($contenttype)       header('Content-Type: '.$contenttype.($outputencoding?'; charset='.$outputencoding:''));
+		if ($contenttype)       header('Content-Type: '.$contenttype.($outputencoding ? '; charset='.$outputencoding : ''));
 		if ($attachment) 		header('Content-Disposition: attachment; filename="'.$shortfilename.'"');
 
 		if ($cachedelay) header('Cache-Control: max-age='.$cachedelay.', private, must-revalidate');
 		else header('Cache-Control: private, must-revalidate');
 
 		// Clean parameters
-		$outputfile=$conf->agenda->dir_temp.'/'.$filename;
-		$result=readfile($outputfile);
-		if (! $result) print 'File '.$outputfile.' was empty.';
+		$outputfile = $conf->agenda->dir_temp.'/'.$filename;
+		$result = readfile($outputfile);
+		if (!$result) print 'File '.$outputfile.' was empty.';
 
 	    //header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
 		exit;
@@ -175,18 +175,18 @@ 
 
 if ($format == 'rss')
 {
-	$result=$agenda->build_exportfile($format,$type,$cachedelay,$filename,$filters);
+	$result = $agenda->build_exportfile($format, $type, $cachedelay, $filename, $filters);
 	if ($result >= 0)
 	{
 		$attachment = false;
-		if (isset($_GET["attachment"])) $attachment=$_GET["attachment"];
+		if (isset($_GET["attachment"])) $attachment = $_GET["attachment"];
 		//$attachment = false;
-		$contenttype='application/rss+xml';
-		if (isset($_GET["contenttype"])) $contenttype=$_GET["contenttype"];
+		$contenttype = 'application/rss+xml';
+		if (isset($_GET["contenttype"])) $contenttype = $_GET["contenttype"];
 		//$contenttype='text/plain';
-		$outputencoding='UTF-8';
+		$outputencoding = 'UTF-8';
 
-		if ($contenttype)       header('Content-Type: '.$contenttype.($outputencoding?'; charset='.$outputencoding:''));
+		if ($contenttype)       header('Content-Type: '.$contenttype.($outputencoding ? '; charset='.$outputencoding : ''));
 		if ($attachment) 		header('Content-Disposition: attachment; filename="'.$filename.'"');
 
 		// Ajout directives pour resoudre bug IE
@@ -196,9 +196,9 @@ 
 		else header('Cache-Control: private, must-revalidate');
 
 		// Clean parameters
-		$outputfile=$conf->agenda->dir_temp.'/'.$filename;
-		$result=readfile($outputfile);
-		if (! $result) print 'File '.$outputfile.' was empty.';
+		$outputfile = $conf->agenda->dir_temp.'/'.$filename;
+		$result = readfile($outputfile);
+		if (!$result) print 'File '.$outputfile.' was empty.';
 
 	//	header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
 		exit;

htdocs/public/emailing/mailing-read.php

Spacing +12 added lines, -12 removed lines

@@ -25,11 +25,11 @@ 
  *      \brief      Script use to update mail status if destinaries read it (if images during mail read are display)
  */
 
-if (! defined('NOLOGIN'))        define("NOLOGIN",1);			// This means this output page does not require to be logged.
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');		// Do not check anti CSRF attack test
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');	// Do not check anti POST attack test
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');	// If there is no need to load and show top and left menu
+if (!defined('NOLOGIN'))        define("NOLOGIN", 1); // This means this output page does not require to be logged.
+if (!defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
+if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1'); // Do not check anti CSRF attack test
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Do not check anti POST attack test
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no need to load and show top and left menu
 
 /**
  * Header empty
@@ -47,8 +47,8 @@ 
 
 require '../../main.inc.php';
 
-$tag=GETPOST('tag');
-$securitykey=GETPOST('securitykey');
+$tag = GETPOST('tag');
+$securitykey = GETPOST('securitykey');
 
 
 /*
@@ -63,25 +63,25 @@ 
 	exit;
 }
 
-if (! empty($tag))
+if (!empty($tag))
 {
-	$statut='2';
+	$statut = '2';
 	$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles SET statut=".$statut." WHERE tag='".$db->escape($tag)."'";
 	dol_syslog("public/emailing/mailing-read.php : Mail read : ".$sql, LOG_DEBUG);
 
-	$resql=$db->query($sql);
+	$resql = $db->query($sql);
 
 	//Update status communication of thirdparty prospect
 	$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=3 WHERE fk_stcomm != -1 AND rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE tag='".$db->escape($tag)."' AND source_type='thirdparty' AND source_id is not null)";
 	dol_syslog("public/emailing/mailing-read.php : Mail read thirdparty : ".$sql, LOG_DEBUG);
 
-	$resql=$db->query($sql);
+	$resql = $db->query($sql);
 
     //Update status communication of contact prospect
 	$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=3 WHERE fk_stcomm != -1 AND rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.tag = '".$db->escape($tag)."' AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
 	dol_syslog("public/emailing/mailing-read.php : Mail read contact : ".$sql, LOG_DEBUG);
 
-	$resql=$db->query($sql);
+	$resql = $db->query($sql);
 
 }
 

htdocs/public/emailing/mailing-unsubscribe.php

Spacing +17 added lines, -17 removed lines

@@ -26,9 +26,9 @@ 
  *      \brief      Script use to update unsubcribe contact to prospect mailing list
  */
 
-if (! defined('NOLOGIN'))        define("NOLOGIN",1);			// This means this output page does not require to be logged.
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');		// Do not check anti CSRF attack test
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');	// If there is no need to load and show top and left menu
+if (!defined('NOLOGIN'))        define("NOLOGIN", 1); // This means this output page does not require to be logged.
+if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1'); // Do not check anti CSRF attack test
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no need to load and show top and left menu
 
 /**
  * Header empty
@@ -52,9 +52,9 @@ 
 $langs->load("main");
 $langs->load("mails");
 
-$tag=GETPOST('tag');
-$unsuscrib=GETPOST('unsuscrib');
-$securitykey=GETPOST('securitykey');
+$tag = GETPOST('tag');
+$unsuscrib = GETPOST('unsuscrib');
+$securitykey = GETPOST('securitykey');
 
 
 /*
@@ -70,37 +70,37 @@ 
 }
 
 
-if (! empty($tag) && ($unsuscrib=='1'))
+if (!empty($tag) && ($unsuscrib == '1'))
 {
 	// Update status of mail in recipient mailing list table
-	$statut='3';
+	$statut = '3';
 	$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles SET statut=".$statut." WHERE tag='".$db->escape($tag)."'";
 	dol_syslog("public/emailing/mailing-unsubscribe.php : Mail unsubcribe : ".$sql, LOG_DEBUG);
 
-	$resql=$db->query($sql);
-	if (! $resql) dol_print_error($db);
+	$resql = $db->query($sql);
+	if (!$resql) dol_print_error($db);
 
 	// Update status communication of thirdparty prospect
 	$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=-1 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE tag='".$db->escape($tag)."' AND source_type='thirdparty' AND source_id is not null)";
 	dol_syslog("public/emailing/mailing-unsubscribe.php : Mail unsubcribe thirdparty : ".$sql, LOG_DEBUG);
 
-	$resql=$db->query($sql);
-	if (! $resql) dol_print_error($db);
+	$resql = $db->query($sql);
+	if (!$resql) dol_print_error($db);
 
     // Update status communication of contact prospect
 	$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET no_email=1 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE tag = '".$db->escape($tag)."' AND source_type='contact' AND source_id is not null)";
 	dol_syslog("public/emailing/mailing-unsubscribe.php : Mail unsubcribe contact : ".$sql, LOG_DEBUG);
 
-	$resql=$db->query($sql);
-	if (! $resql) dol_print_error($db);
+	$resql = $db->query($sql);
+	if (!$resql) dol_print_error($db);
 
 
 	$sql = "SELECT mc.email";
 	$sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
 	$sql .= " WHERE mc.tag='".$db->escape($tag)."'";
 
-	$resql=$db->query($sql);
-	if (! $resql) dol_print_error($db);
+	$resql = $db->query($sql);
+	if (!$resql) dol_print_error($db);
 
 	$obj = $db->fetch_object($resql);
 
@@ -123,7 +123,7 @@ 
 	print "</head>\n";
 	print '<body style="margin: 20px;">'."\n";
 	print '<table><tr><td style="text_align:center;">';
-	print $langs->trans("YourMailUnsubcribeOK",$obj->email)."<br>\n";
+	print $langs->trans("YourMailUnsubcribeOK", $obj->email)."<br>\n";
 	print '</td></tr></table>';
 	print "</body>\n";
 	print "</html>\n";

htdocs/public/error-401.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
     Sorry. You are not allowed to access this resource.
 
     <br>
-    <?php print isset($_SERVER["HTTP_REFERER"])?'You come from '.$_SERVER["HTTP_REFERER"].'.':''; ?>
+    <?php print isset($_SERVER["HTTP_REFERER"]) ? 'You come from '.$_SERVER["HTTP_REFERER"].'.' : ''; ?>
 
     <hr>
 

htdocs/public/opensurvey/studs.php

Spacing +140 added lines, -140 removed lines

@@ -22,8 +22,8 @@ 
  *	\brief      Page to list surveys
  */
 
-define("NOLOGIN",1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+define("NOLOGIN", 1); // This means this output page does not require to be logged.
+define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
 require_once('../../main.inc.php');
 require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
@@ -32,23 +32,23 @@ 
 
 
 // Init vars
-$action=GETPOST('action','aZ09');
+$action = GETPOST('action', 'aZ09');
 $numsondage = '';
 if (GETPOST('sondage'))
 {
 	$numsondage = GETPOST('sondage', 'alpha');
 }
 
-$object=new Opensurveysondage($db);
-$result=$object->fetch(0,$numsondage);
+$object = new Opensurveysondage($db);
+$result = $object->fetch(0, $numsondage);
 
-$nblignes=$object->fetch_lines();
+$nblignes = $object->fetch_lines();
 
 //If the survey has not yet finished, then it can be modified
 $canbemodified = ((empty($object->date_fin) || $object->date_fin > dol_now()) && $object->status != Opensurveysondage::STATUS_CLOSED);
 
 // Security check
-if (empty($conf->opensurvey->enabled)) accessforbidden('',0,0,1);
+if (empty($conf->opensurvey->enabled)) accessforbidden('', 0, 0, 1);
 
 
 /*
@@ -57,34 +57,34 @@ 
 
 $nbcolonnes = substr_count($object->sujet, ',') + 1;
 
-$listofvoters=explode(',',$_SESSION["savevoter"]);
+$listofvoters = explode(',', $_SESSION["savevoter"]);
 
 // Add comment
 if (GETPOST('ajoutcomment'))
 {
 	if (!$canbemodified) accessforbidden();
 
-	$error=0;
+	$error = 0;
 
-	if (! GETPOST('comment'))
+	if (!GETPOST('comment'))
 	{
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Comment")), null, 'errors');
 	}
-	if (! GETPOST('commentuser'))
+	if (!GETPOST('commentuser'))
 	{
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("User")), null, 'errors');
 	}
 
-	if (! $error)
+	if (!$error)
 	{
 		$comment = GETPOST("comment");
 		$comment_user = GETPOST('commentuser');
 
 		$resql = $object->addComment($comment, $comment_user);
 
-		if (! $resql) dol_print_error($db);
+		if (!$resql) dol_print_error($db);
 	}
 }
 
@@ -97,29 +97,29 @@ 
 	if (GETPOST('nom'))
 	{
 		$nouveauchoix = '';
-		for ($i=0;$i<$nbcolonnes;$i++)
+		for ($i = 0; $i < $nbcolonnes; $i++)
 		{
 			if (isset($_POST["choix$i"]) && $_POST["choix$i"] == '1')
 			{
-				$nouveauchoix.="1";
+				$nouveauchoix .= "1";
 			}
 			else if (isset($_POST["choix$i"]) && $_POST["choix$i"] == '2')
 			{
-				$nouveauchoix.="2";
+				$nouveauchoix .= "2";
 			}
 			else { // sinon c'est 0
-				$nouveauchoix.="0";
+				$nouveauchoix .= "0";
 			}
 		}
 
-		$nom=substr(GETPOST("nom"),0,64);
+		$nom = substr(GETPOST("nom"), 0, 64);
 
 		// Check if vote already exists
 		$sql = 'SELECT id_users, nom as name';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'opensurvey_user_studs';
-		$sql.= " WHERE id_sondage='".$db->escape($numsondage)."' AND nom = '".$db->escape($nom)."' ORDER BY id_users";
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'opensurvey_user_studs';
+		$sql .= " WHERE id_sondage='".$db->escape($numsondage)."' AND nom = '".$db->escape($nom)."' ORDER BY id_users";
 		$resql = $db->query($sql);
-		if (! $resql) dol_print_error($db);
+		if (!$resql) dol_print_error($db);
 
 		$num_rows = $db->num_rows($resql);
 		if ($num_rows > 0)
@@ -130,14 +130,14 @@ 
 		else
 		{
 			$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'opensurvey_user_studs (nom, id_sondage, reponses)';
-			$sql.= " VALUES ('".$db->escape($nom)."', '".$db->escape($numsondage)."','".$db->escape($nouveauchoix)."')";
-			$resql=$db->query($sql);
+			$sql .= " VALUES ('".$db->escape($nom)."', '".$db->escape($numsondage)."','".$db->escape($nouveauchoix)."')";
+			$resql = $db->query($sql);
 
 			if ($resql)
 			{
 				// Add voter to session
-				$_SESSION["savevoter"]=$nom.','.(empty($_SESSION["savevoter"])?'':$_SESSION["savevoter"]);	// Save voter
-				$listofvoters=explode(',',$_SESSION["savevoter"]);
+				$_SESSION["savevoter"] = $nom.','.(empty($_SESSION["savevoter"]) ? '' : $_SESSION["savevoter"]); // Save voter
+				$listofvoters = explode(',', $_SESSION["savevoter"]);
 
 				if ($object->mailsonde)
 				{
@@ -156,8 +156,8 @@ 
 
 						$body = $langs->trans('EmailSomeoneVoted', $nom, getUrlSondage($numsondage, true));
 
-						$cmailfile=new CMailFile("[".MAIN_APPLICATION_TITLE."] ".$langs->trans("Poll").': '.$object->titre, $email, $conf->global->MAIN_MAIL_EMAIL_FROM, $body);
-						$result=$cmailfile->sendfile();
+						$cmailfile = new CMailFile("[".MAIN_APPLICATION_TITLE."] ".$langs->trans("Poll").': '.$object->titre, $email, $conf->global->MAIN_MAIL_EMAIL_FROM, $body);
+						$result = $cmailfile->sendfile();
 					}
 				}
 			}
@@ -175,19 +175,19 @@ 
 $testmodifier = false;
 $testligneamodifier = false;
 $ligneamodifier = -1;
-for ($i=0; $i<$nblignes; $i++)
+for ($i = 0; $i < $nblignes; $i++)
 {
 	if (isset($_POST['modifierligne'.$i]))
 	{
-		$ligneamodifier=$i;
-		$testligneamodifier=true;
+		$ligneamodifier = $i;
+		$testligneamodifier = true;
 	}
 
 	//test to see if a line is to be modified
 	if (isset($_POST['validermodifier'.$i]))
 	{
-		$modifier=$i;
-		$testmodifier=true;
+		$modifier = $i;
+		$testmodifier = true;
 	}
 }
 
@@ -195,35 +195,35 @@ 
 {
 	//var_dump($_POST);exit;
 	$nouveauchoix = '';
-	for ($i=0;$i<$nbcolonnes;$i++)
+	for ($i = 0; $i < $nbcolonnes; $i++)
 	{
 		//var_dump($_POST["choix$i"]);
 		if (isset($_POST["choix".$i]) && $_POST["choix".$i] == '1')
 		{
-			$nouveauchoix.="1";
+			$nouveauchoix .= "1";
 		}
 		else if (isset($_POST["choix".$i]) && $_POST["choix".$i] == '2')
 		{
-			$nouveauchoix.="2";
+			$nouveauchoix .= "2";
 		}
 		else { // sinon c'est 0
-			$nouveauchoix.="0";
+			$nouveauchoix .= "0";
 		}
 	}
 
 	if (!$canbemodified) accessforbidden();
 
-	$idtomodify=$_POST["idtomodify".$modifier];
+	$idtomodify = $_POST["idtomodify".$modifier];
 	$sql = 'UPDATE '.MAIN_DB_PREFIX."opensurvey_user_studs";
-	$sql.= " SET reponses = '".$db->escape($nouveauchoix)."'";
-	$sql.= " WHERE id_users = '".$db->escape($idtomodify)."'";
+	$sql .= " SET reponses = '".$db->escape($nouveauchoix)."'";
+	$sql .= " WHERE id_users = '".$db->escape($idtomodify)."'";
 
 	$resql = $db->query($sql);
-	if (! $resql) dol_print_error($db);
+	if (!$resql) dol_print_error($db);
 }
 
 // Delete comment
-$idcomment=GETPOST('deletecomment','int');
+$idcomment = GETPOST('deletecomment', 'int');
 if ($idcomment)
 {
 	if (!$canbemodified) accessforbidden();
@@ -237,10 +237,10 @@ 
  * View
  */
 
-$form=new Form($db);
+$form = new Form($db);
 
-$arrayofjs=array();
-$arrayofcss=array('/opensurvey/css/style.css');
+$arrayofjs = array();
+$arrayofcss = array('/opensurvey/css/style.css');
 llxHeaderSurvey($object->titre, "", 0, 0, $arrayofjs, $arrayofcss);
 
 if (empty($object->ref))     // For survey, id is a hex string
@@ -255,14 +255,14 @@ 
 }
 
 // Define format of choices
-$toutsujet=explode(",",$object->sujet);
-$listofanswers=array();
+$toutsujet = explode(",", $object->sujet);
+$listofanswers = array();
 foreach ($toutsujet as $value)
 {
-	$tmp=explode('@',$value);
-	$listofanswers[]=array('label'=>$tmp[0],'format'=>($tmp[1]?$tmp[1]:'checkbox'));
+	$tmp = explode('@', $value);
+	$listofanswers[] = array('label'=>$tmp[0], 'format'=>($tmp[1] ? $tmp[1] : 'checkbox'));
 }
-$toutsujet=str_replace("°","'",$toutsujet);
+$toutsujet = str_replace("°", "'", $toutsujet);
 
 
 print '<div class="survey_invitation">'.$langs->trans("YouAreInivitedToVote").'</div>';
@@ -271,7 +271,7 @@ 
 print '<div class="corps"> '."\n";
 
 //affichage du titre du sondage
-$titre=str_replace("\\","",$object->titre);
+$titre = str_replace("\\", "", $object->titre);
 print '<strong>'.dol_htmlentities($titre).'</strong><br><br>'."\n";
 
 //affichage des commentaires du sondage
@@ -294,7 +294,7 @@ 
 }
 
 print '<form name="formulaire" action="studs.php?sondage='.$numsondage.'"'.'#bas" method="POST">'."\n";
-print '<input type="hidden" name="sondage" value="' . $numsondage . '"/>';
+print '<input type="hidden" name="sondage" value="'.$numsondage.'"/>';
 
 print '<div class="cadre"> '."\n";
 print '<br><br>'."\n";
@@ -303,22 +303,22 @@ 
 print '<table class="resultats">'."\n";
 
 // Show choice titles
-if ($object->format=="D")
+if ($object->format == "D")
 {
 	//display of survey topics
 	print '<tr>'."\n";
 	print '<td></td>'."\n";
 
 	//display of years
-	$colspan=1;
-	$nbofsujet=count($toutsujet);
-	for ($i=0;$i<$nbofsujet;$i++)
+	$colspan = 1;
+	$nbofsujet = count($toutsujet);
+	for ($i = 0; $i < $nbofsujet; $i++)
 	{
-		if (isset($toutsujet[$i+1]) && date('Y', intval($toutsujet[$i])) == date('Y', intval($toutsujet[$i+1]))) {
+		if (isset($toutsujet[$i + 1]) && date('Y', intval($toutsujet[$i])) == date('Y', intval($toutsujet[$i + 1]))) {
 			$colspan++;
 		} else {
 			print '<td colspan='.$colspan.' class="annee">'.date('Y', intval($toutsujet[$i])).'</td>'."\n";
-			$colspan=1;
+			$colspan = 1;
 		}
 	}
 
@@ -327,21 +327,21 @@ 
 	print '<td></td>'."\n";
 
 	//display of months
-	$colspan=1;
-	for ($i=0;$i<$nbofsujet;$i++) {
-		$cur = intval($toutsujet[$i]);	// intval() est utiliser pour supprimer le suffixe @* qui déplaît logiquement à strftime()
+	$colspan = 1;
+	for ($i = 0; $i < $nbofsujet; $i++) {
+		$cur = intval($toutsujet[$i]); // intval() est utiliser pour supprimer le suffixe @* qui déplaît logiquement à strftime()
 
-		if (isset($toutsujet[$i+1]) === false) {
+		if (isset($toutsujet[$i + 1]) === false) {
 			$next = false;
 		} else {
-			$next = intval($toutsujet[$i+1]);
+			$next = intval($toutsujet[$i + 1]);
 		}
 
-		if ($next && dol_print_date($cur, "%B") == dol_print_date($next, "%B") && dol_print_date($cur, "%Y") == dol_print_date($next, "%Y")){
+		if ($next && dol_print_date($cur, "%B") == dol_print_date($next, "%B") && dol_print_date($cur, "%Y") == dol_print_date($next, "%Y")) {
 			$colspan++;
 		} else {
 			print '<td colspan='.$colspan.' class="mois">'.dol_print_date($cur, "%B").'</td>'."\n";
-			$colspan=1;
+			$colspan = 1;
 		}
 	}
 
@@ -350,19 +350,19 @@ 
 	print '<td></td>'."\n";
 
 	//display of days
-	$colspan=1;
-	for ($i=0;$i<$nbofsujet;$i++) {
+	$colspan = 1;
+	for ($i = 0; $i < $nbofsujet; $i++) {
 		$cur = intval($toutsujet[$i]);
-		if (isset($toutsujet[$i+1]) === false) {
+		if (isset($toutsujet[$i + 1]) === false) {
 			$next = false;
 		} else {
-			$next = intval($toutsujet[$i+1]);
+			$next = intval($toutsujet[$i + 1]);
 		}
-		if ($next && dol_print_date($cur, "%a %e") == dol_print_date($next,"%a %e") && dol_print_date($cur, "%B") == dol_print_date($next, "%B")) {
+		if ($next && dol_print_date($cur, "%a %e") == dol_print_date($next, "%a %e") && dol_print_date($cur, "%B") == dol_print_date($next, "%B")) {
 			$colspan++;
 		} else {
 			print '<td colspan="'.$colspan.'" class="jour">'.dol_print_date($cur, "%a %e").'</td>'."\n";
-			$colspan=1;
+			$colspan = 1;
 		}
 	}
 
@@ -373,8 +373,8 @@ 
 		print '<tr>'."\n";
 		print '<td></td>'."\n";
 
-		for ($i=0; isset($toutsujet[$i]); $i++) {
-			$heures=explode('@',$toutsujet[$i]);
+		for ($i = 0; isset($toutsujet[$i]); $i++) {
+			$heures = explode('@', $toutsujet[$i]);
 			if (isset($heures[1])) {
 				print '<td class="heure">'.dol_htmlentities($heures[1]).'</td>'."\n";
 			} else {
@@ -391,9 +391,9 @@ 
 	print '<tr>'."\n";
 	print '<td></td>'."\n";
 
-	for ($i=0; isset($toutsujet[$i]); $i++)
+	for ($i = 0; isset($toutsujet[$i]); $i++)
 	{
-		$tmp=explode('@',$toutsujet[$i]);
+		$tmp = explode('@', $toutsujet[$i]);
 		print '<td class="sujet">'.$tmp[0].'</td>'."\n";
 	}
 
@@ -405,19 +405,19 @@ 
 $sumfor = array();
 $sumagainst = array();
 $compteur = 0;
-$sql ="SELECT id_users, nom as name, id_sondage, reponses";
-$sql.=" FROM ".MAIN_DB_PREFIX."opensurvey_user_studs";
-$sql.=" WHERE id_sondage = '".$db->escape($numsondage)."'";
-$resql=$db->query($sql);
-if (! $resql)
+$sql = "SELECT id_users, nom as name, id_sondage, reponses";
+$sql .= " FROM ".MAIN_DB_PREFIX."opensurvey_user_studs";
+$sql .= " WHERE id_sondage = '".$db->escape($numsondage)."'";
+$resql = $db->query($sql);
+if (!$resql)
 {
 	dol_print_error($db);
 	exit;
 }
-$num=$db->num_rows($resql);
+$num = $db->num_rows($resql);
 while ($compteur < $num)
 {
-	$obj=$db->fetch_object($resql);
+	$obj = $db->fetch_object($resql);
 
 	$ensemblereponses = $obj->reponses;
 
@@ -435,40 +435,40 @@ 
 	print '<td class="nom">'.dol_htmlentities($obj->name).'</td>'."\n";
 
 	// si la ligne n'est pas a changer, on affiche les données
-	if (! $testligneamodifier)
+	if (!$testligneamodifier)
 	{
 		for ($i = 0; $i < $nbcolonnes; $i++)
 		{
 			$car = substr($ensemblereponses, $i, 1);
 			//print 'xx'.$i."-".$car.'-'.$listofanswers[$i]['format'].'zz';
 
-			if (empty($listofanswers[$i]['format']) || ! in_array($listofanswers[$i]['format'],array('yesno','foragainst')))
+			if (empty($listofanswers[$i]['format']) || !in_array($listofanswers[$i]['format'], array('yesno', 'foragainst')))
 			{
 				if (((string) $car) == "1") print '<td class="ok">OK</td>'."\n";
 				else print '<td class="non">KO</td>'."\n";
 				// Total
-				if (! isset($sumfor[$i])) $sumfor[$i] = 0;
+				if (!isset($sumfor[$i])) $sumfor[$i] = 0;
 				if (((string) $car) == "1") $sumfor[$i]++;
 			}
-			if (! empty($listofanswers[$i]['format']) && $listofanswers[$i]['format'] == 'yesno')
+			if (!empty($listofanswers[$i]['format']) && $listofanswers[$i]['format'] == 'yesno')
 			{
 				if (((string) $car) == "1") print '<td class="ok">'.$langs->trans("Yes").'</td>'."\n";
 				else if (((string) $car) == "0") print '<td class="non">'.$langs->trans("No").'</td>'."\n";
 				else print '<td class="vide">&nbsp;</td>'."\n";
 				// Total
-				if (! isset($sumfor[$i])) $sumfor[$i] = 0;
-				if (! isset($sumagainst[$i])) $sumagainst[$i] = 0;
+				if (!isset($sumfor[$i])) $sumfor[$i] = 0;
+				if (!isset($sumagainst[$i])) $sumagainst[$i] = 0;
 				if (((string) $car) == "1") $sumfor[$i]++;
 				if (((string) $car) == "0") $sumagainst[$i]++;
 			}
-			if (! empty($listofanswers[$i]['format']) && $listofanswers[$i]['format'] == 'foragainst')
+			if (!empty($listofanswers[$i]['format']) && $listofanswers[$i]['format'] == 'foragainst')
 			{
 				if (((string) $car) == "1") print '<td class="ok">'.$langs->trans("For").'</td>'."\n";
 				else if (((string) $car) == "0") print '<td class="non">'.$langs->trans("Against").'</td>'."\n";
 				else print '<td class="vide">&nbsp;</td>'."\n";
 				// Total
-				if (! isset($sumfor[$i])) $sumfor[$i] = 0;
-				if (! isset($sumagainst[$i])) $sumagainst[$i] = 0;
+				if (!isset($sumfor[$i])) $sumfor[$i] = 0;
+				if (!isset($sumagainst[$i])) $sumagainst[$i] = 0;
 				if (((string) $car) == "1") $sumfor[$i]++;
 				if (((string) $car) == "0") $sumagainst[$i]++;
 			}
@@ -483,20 +483,20 @@ 
 			{
 				$car = substr($ensemblereponses, $i, 1);
 				print '<td class="vide">';
-				if (empty($listofanswers[$i]['format']) || ! in_array($listofanswers[$i]['format'],array('yesno','foragainst')))
+				if (empty($listofanswers[$i]['format']) || !in_array($listofanswers[$i]['format'], array('yesno', 'foragainst')))
 				{
 					print '<input type="checkbox" name="choix'.$i.'" value="1" ';
 					if ($car == '1') print 'checked';
 					print '>';
 				}
-				if (! empty($listofanswers[$i]['format']) && $listofanswers[$i]['format'] == 'yesno')
+				if (!empty($listofanswers[$i]['format']) && $listofanswers[$i]['format'] == 'yesno')
 				{
-					$arraychoice=array('2'=>'&nbsp;','0'=>$langs->trans("No"),'1'=>$langs->trans("Yes"));
+					$arraychoice = array('2'=>'&nbsp;', '0'=>$langs->trans("No"), '1'=>$langs->trans("Yes"));
 					print $form->selectarray("choix".$i, $arraychoice, $car);
 				}
-				if (! empty($listofanswers[$i]['format']) && $listofanswers[$i]['format'] == 'foragainst')
+				if (!empty($listofanswers[$i]['format']) && $listofanswers[$i]['format'] == 'foragainst')
 				{
-					$arraychoice=array('2'=>'&nbsp;','0'=>$langs->trans("Against"),'1'=>$langs->trans("For"));
+					$arraychoice = array('2'=>'&nbsp;', '0'=>$langs->trans("Against"), '1'=>$langs->trans("For"));
 					print $form->selectarray("choix".$i, $arraychoice, $car);
 				}
 				print '</td>'."\n";
@@ -507,33 +507,33 @@ 
 			for ($i = 0; $i < $nbcolonnes; $i++)
 			{
 				$car = substr($ensemblereponses, $i, 1);
-				if (empty($listofanswers[$i]['format']) || ! in_array($listofanswers[$i]['format'],array('yesno','foragainst')))
+				if (empty($listofanswers[$i]['format']) || !in_array($listofanswers[$i]['format'], array('yesno', 'foragainst')))
 				{
 					if (((string) $car) == "1") print '<td class="ok">OK</td>'."\n";
 					else print '<td class="non">KO</td>'."\n";
 					// Total
-					if (! isset($sumfor[$i])) $sumfor[$i] = 0;
+					if (!isset($sumfor[$i])) $sumfor[$i] = 0;
 					if (((string) $car) == "1") $sumfor[$i]++;
 				}
-				if (! empty($listofanswers[$i]['format']) && $listofanswers[$i]['format'] == 'yesno')
+				if (!empty($listofanswers[$i]['format']) && $listofanswers[$i]['format'] == 'yesno')
 				{
 					if (((string) $car) == "1") print '<td class="ok">'.$langs->trans("For").'</td>'."\n";
 					else if (((string) $car) == "0") print '<td class="non">'.$langs->trans("Against").'</td>'."\n";
 					else print '<td class="vide">&nbsp;</td>'."\n";
 					// Total
-					if (! isset($sumfor[$i])) $sumfor[$i] = 0;
-					if (! isset($sumagainst[$i])) $sumagainst[$i] = 0;
+					if (!isset($sumfor[$i])) $sumfor[$i] = 0;
+					if (!isset($sumagainst[$i])) $sumagainst[$i] = 0;
 					if (((string) $car) == "1") $sumfor[$i]++;
 					if (((string) $car) == "0") $sumagainst[$i]++;
 				}
-				if (! empty($listofanswers[$i]['format']) && $listofanswers[$i]['format'] == 'foragainst')
+				if (!empty($listofanswers[$i]['format']) && $listofanswers[$i]['format'] == 'foragainst')
 				{
 					if (((string) $car) == "1") print '<td class="ok">'.$langs->trans("For").'</td>'."\n";
 					else if (((string) $car) == "0") print '<td class="non">'.$langs->trans("Against").'</td>'."\n";
 					else print '<td class="vide">&nbsp;</td>'."\n";
 					// Total
-					if (! isset($sumfor[$i])) $sumfor[$i] = 0;
-					if (! isset($sumagainst[$i])) $sumagainst[$i] = 0;
+					if (!isset($sumfor[$i])) $sumfor[$i] = 0;
+					if (!isset($sumagainst[$i])) $sumagainst[$i] = 0;
 					if (((string) $car) == "1") $sumfor[$i]++;
 					if (((string) $car) == "0") $sumagainst[$i]++;
 				}
@@ -548,7 +548,7 @@ 
 	}
 
 	//demande de confirmation pour modification de ligne
-	for ($i=0; $i<$nblignes; $i++)
+	for ($i = 0; $i < $nblignes; $i++)
 	{
 		if (isset($_POST["modifierligne".$i]))
 		{
@@ -567,7 +567,7 @@ 
 }
 
 // Add line to add new record
-if ($ligneamodifier < 0 && (! isset($_SESSION['nom'])))
+if ($ligneamodifier < 0 && (!isset($_SESSION['nom'])))
 {
 	print '<tr>'."\n";
 	print '<td class="nom">'."\n";
@@ -580,10 +580,10 @@ 
 	print '</td>'."\n";
 
 	// affichage des cases de formulaire checkbox pour un nouveau choix
-	for ($i=0;$i<$nbcolonnes;$i++)
+	for ($i = 0; $i < $nbcolonnes; $i++)
 	{
 		print '<td class="vide">';
-		if (empty($listofanswers[$i]['format']) || ! in_array($listofanswers[$i]['format'],array('yesno','foragainst')))
+		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')
@@ -592,29 +592,29 @@ 
 			}
 			print '>';
 		}
-		if (! empty($listofanswers[$i]['format']) && $listofanswers[$i]['format'] == 'yesno')
+		if (!empty($listofanswers[$i]['format']) && $listofanswers[$i]['format'] == 'yesno')
 		{
-			$arraychoice=array('2'=>'&nbsp;','0'=>$langs->trans("No"),'1'=>$langs->trans("Yes"));
+			$arraychoice = array('2'=>'&nbsp;', '0'=>$langs->trans("No"), '1'=>$langs->trans("Yes"));
 			print $form->selectarray("choix".$i, $arraychoice, GETPOST('choix'.$i));
 		}
-		if (! empty($listofanswers[$i]['format']) && $listofanswers[$i]['format'] == 'foragainst')
+		if (!empty($listofanswers[$i]['format']) && $listofanswers[$i]['format'] == 'foragainst')
 		{
-			$arraychoice=array('2'=>'&nbsp;','0'=>$langs->trans("Against"),'1'=>$langs->trans("For"));
+			$arraychoice = array('2'=>'&nbsp;', '0'=>$langs->trans("Against"), '1'=>$langs->trans("For"));
 			print $form->selectarray("choix".$i, $arraychoice, GETPOST('choix'.$i));
 		}
 		print '</td>'."\n";
 	}
 
 	// Affichage du bouton de formulaire pour inscrire un nouvel utilisateur dans la base
-	print '<td><input type="image" name="boutonp" value="'.$langs->trans("Vote").'" src="'.dol_buildpath('/opensurvey/img/add-24.png',1).'"></td>'."\n";
+	print '<td><input type="image" name="boutonp" value="'.$langs->trans("Vote").'" src="'.dol_buildpath('/opensurvey/img/add-24.png', 1).'"></td>'."\n";
 	print '</tr>'."\n";
 }
 
 // Select value of best choice (for checkbox columns only)
-$nbofcheckbox=0;
-for ($i=0; $i < $nbcolonnes; $i++)
+$nbofcheckbox = 0;
+for ($i = 0; $i < $nbcolonnes; $i++)
 {
-	if (empty($listofanswers[$i]['format']) || ! in_array($listofanswers[$i]['format'],array('yesno','foragainst')))
+	if (empty($listofanswers[$i]['format']) || !in_array($listofanswers[$i]['format'], array('yesno', 'foragainst')))
 	$nbofcheckbox++;
 	if (isset($sumfor[$i]))
 	{
@@ -622,7 +622,7 @@ 
 		{
 			$meilleurecolonne = $sumfor[$i];
 		}
-		if (! isset($meilleurecolonne) || $sumfor[$i] > $meilleurecolonne)
+		if (!isset($meilleurecolonne) || $sumfor[$i] > $meilleurecolonne)
 		{
 			$meilleurecolonne = $sumfor[$i];
 		}
@@ -632,18 +632,18 @@ 
 if ($object->allow_spy) {
 	// Show line total
 	print '<tr>'."\n";
-	print '<td align="center">'. $langs->trans("Total") .'</td>'."\n";
+	print '<td align="center">'.$langs->trans("Total").'</td>'."\n";
 	for ($i = 0; $i < $nbcolonnes; $i++)
 	{
-		$showsumfor = isset($sumfor[$i])?$sumfor[$i]:'';
-		$showsumagainst = isset($sumagainst[$i])?$sumagainst[$i]:'';
+		$showsumfor = isset($sumfor[$i]) ? $sumfor[$i] : '';
+		$showsumagainst = isset($sumagainst[$i]) ? $sumagainst[$i] : '';
 		if (empty($showsumfor)) $showsumfor = 0;
 		if (empty($showsumagainst)) $showsumagainst = 0;
 
 		print '<td>';
-		if (empty($listofanswers[$i]['format']) || ! in_array($listofanswers[$i]['format'],array('yesno','foragainst'))) print $showsumfor;
-		if (! empty($listofanswers[$i]['format']) && $listofanswers[$i]['format'] == 'yesno') print $langs->trans("Yes").': '.$showsumfor.'<br>'.$langs->trans("No").': '.$showsumagainst;
-		if (! empty($listofanswers[$i]['format']) && $listofanswers[$i]['format'] == 'foragainst') print $langs->trans("For").': '.$showsumfor.'<br>'.$langs->trans("Against").': '.$showsumagainst;
+		if (empty($listofanswers[$i]['format']) || !in_array($listofanswers[$i]['format'], array('yesno', 'foragainst'))) print $showsumfor;
+		if (!empty($listofanswers[$i]['format']) && $listofanswers[$i]['format'] == 'yesno') print $langs->trans("Yes").': '.$showsumfor.'<br>'.$langs->trans("No").': '.$showsumagainst;
+		if (!empty($listofanswers[$i]['format']) && $listofanswers[$i]['format'] == 'foragainst') print $langs->trans("For").': '.$showsumfor.'<br>'.$langs->trans("Against").': '.$showsumagainst;
 		print '</td>'."\n";
 	}
 	print '</tr>';
@@ -652,12 +652,12 @@ 
 	{
 		print '<tr>'."\n";
 		print '<td class="somme"></td>'."\n";
-		for ($i=0; $i < $nbcolonnes; $i++)
+		for ($i = 0; $i < $nbcolonnes; $i++)
 		{
 			//print 'xx'.(! empty($listofanswers[$i]['format'])).'-'.$sumfor[$i].'-'.$meilleurecolonne;
-			if (empty($listofanswers[$i]['format']) || ! in_array($listofanswers[$i]['format'],array('yesno','foragainst')) && isset($sumfor[$i]) && isset($meilleurecolonne) && $sumfor[$i] == $meilleurecolonne)
+			if (empty($listofanswers[$i]['format']) || !in_array($listofanswers[$i]['format'], array('yesno', 'foragainst')) && isset($sumfor[$i]) && isset($meilleurecolonne) && $sumfor[$i] == $meilleurecolonne)
 			{
-				print '<td class="somme"><img src="'.dol_buildpath('/opensurvey/img/medaille.png',1).'"></td>'."\n";
+				print '<td class="somme"><img src="'.dol_buildpath('/opensurvey/img/medaille.png', 1).'"></td>'."\n";
 			} else {
 				print '<td class="somme"></td>'."\n";
 			}
@@ -669,28 +669,28 @@ 
 print '</div>'."\n";
 
 if ($object->allow_spy) {
-	$toutsujet=explode(",",$object->sujet);
-	$toutsujet=str_replace("°","'",$toutsujet);
+	$toutsujet = explode(",", $object->sujet);
+	$toutsujet = str_replace("°", "'", $toutsujet);
 
-	$compteursujet=0;
+	$compteursujet = 0;
 	$meilleursujet = '';
 
 	for ($i = 0; $i < $nbcolonnes; $i++) {
 		if (isset($sumfor[$i]) && isset($meilleurecolonne) && $sumfor[$i] == $meilleurecolonne) {
-			$meilleursujet.=", ";
-			if ($object->format=="D") {
+			$meilleursujet .= ", ";
+			if ($object->format == "D") {
 				$meilleursujetexport = $toutsujet[$i];
 
 				if (strpos($toutsujet[$i], '@') !== false) {
 					$toutsujetdate = explode("@", $toutsujet[$i]);
-					$meilleursujet .= dol_print_date($toutsujetdate[0],'daytext'). ' ('.dol_print_date($toutsujetdate[0],'%A').')' . ' - ' . $toutsujetdate[1];
+					$meilleursujet .= dol_print_date($toutsujetdate[0], 'daytext').' ('.dol_print_date($toutsujetdate[0], '%A').')'.' - '.$toutsujetdate[1];
 				} else {
-					$meilleursujet .= dol_print_date($toutsujet[$i],'daytext'). ' ('.dol_print_date($toutsujet[$i],'%A').')';
+					$meilleursujet .= dol_print_date($toutsujet[$i], 'daytext').' ('.dol_print_date($toutsujet[$i], '%A').')';
 				}
 			}
 			else
 			{
-				$tmps=explode('@',$toutsujet[$i]);
+				$tmps = explode('@', $toutsujet[$i]);
 				$meilleursujet .= dol_htmlentities($tmps[0]);
 			}
 
@@ -698,7 +698,7 @@ 
 		}
 	}
 
-	$meilleursujet=substr("$meilleursujet", 1);
+	$meilleursujet = substr("$meilleursujet", 1);
 	$meilleursujet = str_replace("°", "'", $meilleursujet);
 
 
@@ -709,9 +709,9 @@ 
 		print '<p class="affichageresultats">'."\n";
 
 		if (isset($meilleurecolonne) && $compteursujet == "1") {
-			print '<img src="'.dol_buildpath('/opensurvey/img/medaille.png',1).'"> ' . $langs->trans('TheBestChoice') . ": <b>".$meilleursujet."</b> " . $langs->trans('with') . " <b>$meilleurecolonne </b>" . $vote_str . ".\n";
+			print '<img src="'.dol_buildpath('/opensurvey/img/medaille.png', 1).'"> '.$langs->trans('TheBestChoice').": <b>".$meilleursujet."</b> ".$langs->trans('with')." <b>$meilleurecolonne </b>".$vote_str.".\n";
 		} elseif (isset($meilleurecolonne)) {
-			print '<img src="'.dol_buildpath('/opensurvey/img/medaille.png',1).'"> ' . $langs->trans('TheBestChoices')  . ": <b>".$meilleursujet."</b> " . $langs->trans('with') . "  <b>$meilleurecolonne </b>" . $vote_str . ".\n";
+			print '<img src="'.dol_buildpath('/opensurvey/img/medaille.png', 1).'"> '.$langs->trans('TheBestChoices').": <b>".$meilleursujet."</b> ".$langs->trans('with')."  <b>$meilleurecolonne </b>".$vote_str.".\n";
 		}
 
 		print '</p><br>'."\n";
@@ -726,7 +726,7 @@ 
 
 if ($comments)
 {
-	print "<br><b>" . $langs->trans("CommentsOfVoters") . ":</b><br>\n";
+	print "<br><b>".$langs->trans("CommentsOfVoters").":</b><br>\n";
 
 	foreach ($comments as $obj) {
 		print '<div class="comment"><span class="usercomment">';
@@ -737,15 +737,15 @@ 
 
 // Form to add comment
 if ($object->allow_comments) {
-	print '<div class="addcomment">' .$langs->trans("AddACommentForPoll") . "<br>\n";
+	print '<div class="addcomment">'.$langs->trans("AddACommentForPoll")."<br>\n";
 
 	print '<textarea name="comment" rows="'.ROWS_2.'" class="quatrevingtpercent"></textarea><br>'."\n";
-	print $langs->trans("Name") .': ';
+	print $langs->trans("Name").': ';
 	print '<input type="text" name="commentuser" maxlength="64" /> &nbsp; '."\n";
 	print '<input type="submit" class="button" name="ajoutcomment" value="'.dol_escape_htmltag($langs->trans("AddComment")).'"><br>'."\n";
 	print '</form>'."\n";
 
-	print '</div>'."\n";	// div add comment
+	print '</div>'."\n"; // div add comment
 }
 
 print '<br><br>';

htdocs/public/error-404.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
     You requested a website or a page that does not exists.
 
     <br>
-    <?php print isset($_SERVER["HTTP_REFERER"])?'You come from '.$_SERVER["HTTP_REFERER"].'.':''; ?>
+    <?php print isset($_SERVER["HTTP_REFERER"]) ? 'You come from '.$_SERVER["HTTP_REFERER"].'.' : ''; ?>
 
     <hr>
 

htdocs/public/test/test_forms.php

Spacing +18 added lines, -18 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 //define("NOLOGIN",1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
-define('REQUIRE_JQUERY_MULTISELECT','select2');
+define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+define('REQUIRE_JQUERY_MULTISELECT', 'select2');
 
 require '../../main.inc.php';
 include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
@@ -25,12 +25,12 @@ 
 
 <!--  Output to test html.form.class.php -->
 <?php
-$form=new Form($db);
+$form = new Form($db);
 
 // Test1: form->select_date using tzuser date
 print "Test 1: We must have here current hour for user (must match hour on browser). Note: Check your are logged so user TZ and DST are known.";
-$offsettz=(empty($_SESSION['dol_tz'])?0:$_SESSION['dol_tz'])*60*60;
-$offsetdst=(empty($_SESSION['dol_dst'])?0:$_SESSION['dol_dst'])*60*60;
+$offsettz = (empty($_SESSION['dol_tz']) ? 0 : $_SESSION['dol_tz']) * 60 * 60;
+$offsetdst = (empty($_SESSION['dol_dst']) ? 0 : $_SESSION['dol_dst']) * 60 * 60;
 print " (dol_tz=".$offsettz." dol_dst=".$dol_dst.")<br>\n";
 $form->select_date('', 'test1', 1, 1, 0);
 
@@ -38,55 +38,55 @@ 
 
 // Test2: form->select_date using tzuser date
 print "Test 2: We must have here 1970-01-01 00:00:00 selected (fields can be empty)<br>\n";
-$form->select_date(dol_get_first_day(1970,1,false), 'test2', 1, 1, 1);
+$form->select_date(dol_get_first_day(1970, 1, false), 'test2', 1, 1, 1);
 
 print '<br><br>'."\n";
 
 // Test3: form->select_date for 1970-01-01 00:00:00
 print "Test 3: We must have here 1970-01-01 00:00:00 selected (fields are mandatory)<br>\n";
-$form->select_date(dol_get_first_day(1970,1,false), 'test3', 1, 1, 0);
+$form->select_date(dol_get_first_day(1970, 1, false), 'test3', 1, 1, 0);
 
 print '<br><br>'."\n";
 
 // Test4a: a select
 print "Test 4a: a select<br>\n";
-$array=array(1=>'Value 1',2=>'Value 2',3=>'Value 3 ith a very long text. aze eazeae e ae aeae a e a ea ea ea e a e aea e ae aeaeaeaze.');
-$selected=3;
+$array = array(1=>'Value 1', 2=>'Value 2', 3=>'Value 3 ith a very long text. aze eazeae e ae aeae a e a ea ea ea e a e aea e ae aeaeaeaze.');
+$selected = 3;
 print $form->selectarray('testselecta', $array, $selected, 1, 0, 0, 'style="min-width: 250px;"', 0, 0, 0, '', '', 1);
 print '<br><br>';
 print "Test 4b: a select<br>\n";
-$array=array(1=>'Value 1',2=>'Value 2',3=>'Value 3');
-$selected=3;
+$array = array(1=>'Value 1', 2=>'Value 2', 3=>'Value 3');
+$selected = 3;
 print $form->selectarray('testselectb', $array, $selected, 1, 0, 0, 'style="min-width: 250px;"', 0, 0, 0, '', '', 1);
 print '<br><br>'."\n";
 print "Test 4c: Select array with no js forced<br>\n";
-$array=array(1=>'Value 1',2=>'Value 2',3=>'Value 3');
-print $form->selectarray('selectarray',$array);
+$array = array(1=>'Value 1', 2=>'Value 2', 3=>'Value 3');
+print $form->selectarray('selectarray', $array);
 
 print '<br><br>'."\n";
 
 print "Test 4d: a select with ajax refresh and with onchange call of url<br>\n";
-$selected=-1;
+$selected = -1;
 print $form->selectArrayAjax('testselectc', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, 'style="min-width: 250px;"', '', 0, 1, '', 1);
 
 print '<br><br>'."\n";
 
 // Test5a: form->select_thirdparty
 print "Test 5a: Select thirdparty<br>\n";
-print $form->select_company(0,'thirdpartytest');
+print $form->select_company(0, 'thirdpartytest');
 
 print '<br><br>'."\n";
 
 // Test5b: form->select_product
 print "Test 5b: Select product (using ajax)<br>\n";
-$form->select_produits(0,'producttest');
+$form->select_produits(0, 'producttest');
 
 print '<br><br>'."\n";
 
 // Test5c: a multiselect
 print "Test 5c: a multiselect<br>\n";
-$array=array(1=>'Value 1',2=>'Value 2',3=>'Value 3');
-$arrayselected=array(1,3);
+$array = array(1=>'Value 1', 2=>'Value 2', 3=>'Value 3');
+$arrayselected = array(1, 3);
 print $form->multiselectarray('testmulti', $array, $arrayselected, '', 0, '', 0, 250);
 
 

htdocs/public/test/test_sessionlock.php

Spacing +13 added lines, -13 removed lines

@@ -1,24 +1,24 @@
 <?php
 
-if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
-if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOSTYLECHECK'))   define('NOSTYLECHECK','1');		// Do not check style html tag into posted data
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');		// If there is no need to load and show top and left menu
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');		// If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');       // Do not load ajax.lib.php library
-if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
+if (!defined('NOREQUIREUSER'))  define('NOREQUIREUSER', '1');
+if (!defined('NOREQUIREDB'))    define('NOREQUIREDB', '1');
+if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
+if (!defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
+if (!defined('NOSTYLECHECK'))   define('NOSTYLECHECK', '1'); // Do not check style html tag into posted data
+if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1'); // Do not check anti CSRF attack test
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Do not check anti POST attack test
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no need to load and show top and left menu
+if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1'); // Do not load ajax.lib.php library
+if (!defined("NOLOGIN"))        define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
 // If you don't need session management (can't be logged if no session used). You must also set
 // NOCSRFCHECK, NOTOKENRENEWAL, NOLOGIN
 // Disable module with GETPOST('disablemodules') won't work. Variable 'dol_...' will not be set.
 // $_SESSION are then simple vars if sessions are not active.
 // TODO We can close session with session_write_close() as soon as we just need read access.
-if (! defined("NOSESSION"))      define("NOSESSION",'1');
+if (!defined("NOSESSION"))      define("NOSESSION", '1');
 
-define('REQUIRE_JQUERY_MULTISELECT','select2');
+define('REQUIRE_JQUERY_MULTISELECT', 'select2');
 
 print PHP_SESSION_DISABLED;
 print PHP_SESSION_NONE;

htdocs/public/notice.php

Spacing +3 added lines, -3 removed lines

@@ -24,8 +24,8 @@ 
  *                /public/notice.php?transphrase=url_encoded_sentence_to_show
  */
 
-define('NOCSRFCHECK',1);
-define('NOLOGIN',1);		
+define('NOCSRFCHECK', 1);
+define('NOLOGIN', 1);		
 
 require '../main.inc.php';
 
@@ -34,7 +34,7 @@ 
  * View
  */
 
-if (! GETPOST('transkey') && ! GETPOST('transphrase'))
+if (!GETPOST('transkey') && !GETPOST('transphrase'))
 {
     print 'Sorry, it seems your internet connexion is off.<br>';
     print 'You need to be connected to network to use this software.<br>';