Dolibarr / dolibarr

htdocs/public/paybox/paymentok.php

Indentation +7 added lines, -7 removed lines

@@ -140,12 +140,12 @@ 
 	$appli=constant('DOL_APPLICATION_TITLE');
 	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
 	{
-	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
-	    if (preg_match('/\d\.\d/', $appli))
-	    {
-	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
-	    }
-	    else $appli.=" ".DOL_VERSION;
+		$appli=$conf->global->MAIN_APPLICATION_TITLE;
+		if (preg_match('/\d\.\d/', $appli))
+		{
+			if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+		}
+		else $appli.=" ".DOL_VERSION;
 	}
 	else $appli.=" ".DOL_VERSION;
 	
@@ -167,7 +167,7 @@ 
 	}
 	$content.="<br>\n";
 	$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
-    $content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
+	$content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
 	$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
 	$content.="tag=".$fulltag."<br>\n";
 

Spacing +50 added lines, -50 removed lines

@@ -22,13 +22,13 @@ 
  *		\brief      File to show page after a successful payment
  */
 
-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.
 
 // For MultiCompany module.
 // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
 // TODO This should be useless. Because entity must be retreive from object ref and not from url.
-$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
 if (is_numeric($entity)) define("DOLENTITY", $entity);
 
 require '../../main.inc.php';
@@ -37,7 +37,7 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 
 // Security check
-if (empty($conf->paybox->enabled)) accessforbidden('',0,0,1);
+if (empty($conf->paybox->enabled)) accessforbidden('', 0, 0, 1);
 
 $langs->load("main");
 $langs->load("other");
@@ -55,13 +55,13 @@ 
 $PAYBOXPAYERID=GETPOST('PAYERID');
 if (empty($PAYBOXPAYERID)) $PAYBOXPAYERID=GETPOST('PayerID');
 */
-$FULLTAG=GETPOST('FULLTAG');
-if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
+$FULLTAG = GETPOST('FULLTAG');
+if (empty($FULLTAG)) $FULLTAG = GETPOST('fulltag');
 
 
-$object = new stdClass();   // For triggers
+$object = new stdClass(); // For triggers
 
-$paymentmethod='paybox';
+$paymentmethod = 'paybox';
 
 
 /*
@@ -76,18 +76,18 @@ 
  * View
  */
 
-dol_syslog("Callback url when a PayBox payment was done. query_string=".(dol_escape_htmltag($_SERVER["QUERY_STRING"])?dol_escape_htmltag($_SERVER["QUERY_STRING"]):'')." script_uri=".(dol_escape_htmltag($_SERVER["SCRIPT_URI"])?dol_escape_htmltag($_SERVER["SCRIPT_URI"]):''), LOG_DEBUG, 0, '_paybox');
+dol_syslog("Callback url when a PayBox payment was done. query_string=".(dol_escape_htmltag($_SERVER["QUERY_STRING"]) ?dol_escape_htmltag($_SERVER["QUERY_STRING"]) : '')." script_uri=".(dol_escape_htmltag($_SERVER["SCRIPT_URI"]) ?dol_escape_htmltag($_SERVER["SCRIPT_URI"]) : ''), LOG_DEBUG, 0, '_paybox');
 
 $tracepost = "";
-foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
+foreach ($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
 dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paybox');
 
 
-$head='';
-if (! empty($conf->global->ONLINE_PAYMENT_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+$head = '';
+if (!empty($conf->global->ONLINE_PAYMENT_CSS_URL)) $head = '<link rel="stylesheet" type="text/css" href="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
 
-$conf->dol_hide_topmenu=1;
-$conf->dol_hide_leftmenu=1;
+$conf->dol_hide_topmenu = 1;
+$conf->dol_hide_leftmenu = 1;
 
 llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
 
@@ -100,7 +100,7 @@ 
 /*
 $onlinetoken              = $PAYBOXTOKEN;
 */
-$fulltag            = $FULLTAG;
+$fulltag = $FULLTAG;
 /*$payerID            = $PAYBOXPAYERID;
 // Set by newpayment.php
 $paymentType        = $_SESSION['PaymentType'];
@@ -115,70 +115,70 @@ 
 
 print $langs->trans("YourPaymentHasBeenRecorded")."<br><br>\n";
 
-$key='ONLINE_PAYMENT_MESSAGE_OK';
-if (! empty($conf->global->$key)) print $conf->global->$key;
+$key = 'ONLINE_PAYMENT_MESSAGE_OK';
+if (!empty($conf->global->$key)) print $conf->global->$key;
 
 
 // Appel des triggers
-include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-$interface=new Interfaces($db);
-$result=$interface->run_triggers('PAYBOX_PAYMENT_OK',$object,$user,$langs,$conf);
-if ($result < 0) { $error++; $errors=$interface->errors; }
+include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+$interface = new Interfaces($db);
+$result = $interface->run_triggers('PAYBOX_PAYMENT_OK', $object, $user, $langs, $conf);
+if ($result < 0) { $error++; $errors = $interface->errors; }
 // Fin appel triggers
 
 
 // Send an email
-if (! empty($conf->global->ONLINE_PAYMENT_SENDEMAIL))
+if (!empty($conf->global->ONLINE_PAYMENT_SENDEMAIL))
 {
-	$sendto=$conf->global->ONLINE_PAYMENT_SENDEMAIL;
-	$from=$conf->global->MAILING_EMAIL_FROM;
+	$sendto = $conf->global->ONLINE_PAYMENT_SENDEMAIL;
+	$from = $conf->global->MAILING_EMAIL_FROM;
 	// Define $urlwithroot
-	$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-	$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+	$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 	//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
 	// Define link to login card
-	$appli=constant('DOL_APPLICATION_TITLE');
-	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+	$appli = constant('DOL_APPLICATION_TITLE');
+	if (!empty($conf->global->MAIN_APPLICATION_TITLE))
 	{
-	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
+	    $appli = $conf->global->MAIN_APPLICATION_TITLE;
 	    if (preg_match('/\d\.\d/', $appli))
 	    {
-	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+	        if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
 	    }
-	    else $appli.=" ".DOL_VERSION;
+	    else $appli .= " ".DOL_VERSION;
 	}
-	else $appli.=" ".DOL_VERSION;
+	else $appli .= " ".DOL_VERSION;
 
-	$urlback=$_SERVER["REQUEST_URI"];
-	$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentReceived");
-	$tmptag=dolExplodeIntoArray($fulltag,'.','=');
-	$content="";
-	if (! empty($tmptag['MEM']))
+	$urlback = $_SERVER["REQUEST_URI"];
+	$topic = '['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentReceived");
+	$tmptag = dolExplodeIntoArray($fulltag, '.', '=');
+	$content = "";
+	if (!empty($tmptag['MEM']))
 	{
 		$langs->load("members");
-		$url=$urlwithroot."/adherents/card_subscriptions.php?rowid=".$tmptag['MEM'];
-		$content.=$langs->trans("PaymentSubscription")."<br>\n";
-		$content.=$langs->trans("MemberId").': '.$tmptag['MEM']."<br>\n";
-		$content.=$langs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
+		$url = $urlwithroot."/adherents/card_subscriptions.php?rowid=".$tmptag['MEM'];
+		$content .= $langs->trans("PaymentSubscription")."<br>\n";
+		$content .= $langs->trans("MemberId").': '.$tmptag['MEM']."<br>\n";
+		$content .= $langs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
 	}
 	else
 	{
-		$content.=$langs->transnoentitiesnoconv("NewOnlinePaymentReceived")."<br>\n";
+		$content .= $langs->transnoentitiesnoconv("NewOnlinePaymentReceived")."<br>\n";
 	}
-	$content.="<br>\n";
-	$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
-    $content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
-	$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
-	$content.="tag=".$fulltag."<br>\n";
+	$content .= "<br>\n";
+	$content .= $langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
+    $content .= $langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
+	$content .= $langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
+	$content .= "tag=".$fulltag."<br>\n";
 
-	$ishtml=dol_textishtml($content);	// May contain urls
+	$ishtml = dol_textishtml($content); // May contain urls
 
 	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 	$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
 
 	// Send an email
-	$result=$mailfile->sendfile();
+	$result = $mailfile->sendfile();
 	if ($result)
 	{
 		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paybox');
@@ -193,7 +193,7 @@ 
 
 print "\n</div>\n";
 
-htmlPrintOnlinePaymentFooter($mysoc,$langs,0,$suffix);
+htmlPrintOnlinePaymentFooter($mysoc, $langs, 0, $suffix);
 
 
 llxFooter('', 'public');

Braces +28 added lines, -13 removed lines

@@ -29,7 +29,9 @@ 
 // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
 // TODO This should be useless. Because entity must be retreive from object ref and not from url.
 $entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
-if (is_numeric($entity)) define("DOLENTITY", $entity);
+if (is_numeric($entity)) {
+	define("DOLENTITY", $entity);
+}
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php';
@@ -37,7 +39,9 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 
 // Security check
-if (empty($conf->paybox->enabled)) accessforbidden('',0,0,1);
+if (empty($conf->paybox->enabled)) {
+	accessforbidden('',0,0,1);
+}
 
 $langs->load("main");
 $langs->load("other");
@@ -56,7 +60,9 @@ 
 if (empty($PAYBOXPAYERID)) $PAYBOXPAYERID=GETPOST('PayerID');
 */
 $FULLTAG=GETPOST('FULLTAG');
-if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
+if (empty($FULLTAG)) {
+	$FULLTAG=GETPOST('fulltag');
+}
 
 
 $object = new stdClass();   // For triggers
@@ -79,12 +85,16 @@ 
 dol_syslog("Callback url when a PayBox payment was done. query_string=".(dol_escape_htmltag($_SERVER["QUERY_STRING"])?dol_escape_htmltag($_SERVER["QUERY_STRING"]):'')." script_uri=".(dol_escape_htmltag($_SERVER["SCRIPT_URI"])?dol_escape_htmltag($_SERVER["SCRIPT_URI"]):''), LOG_DEBUG, 0, '_paybox');
 
 $tracepost = "";
-foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
+foreach($_POST as $k => $v) {
+	$tracepost .= "{$k} - {$v}\n";
+}
 dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paybox');
 
 
 $head='';
-if (! empty($conf->global->ONLINE_PAYMENT_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+if (! empty($conf->global->ONLINE_PAYMENT_CSS_URL)) {
+	$head='<link rel="stylesheet" type="text/css" href="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+}
 
 $conf->dol_hide_topmenu=1;
 $conf->dol_hide_leftmenu=1;
@@ -116,7 +126,9 @@ 
 print $langs->trans("YourPaymentHasBeenRecorded")."<br><br>\n";
 
 $key='ONLINE_PAYMENT_MESSAGE_OK';
-if (! empty($conf->global->$key)) print $conf->global->$key;
+if (! empty($conf->global->$key)) {
+	print $conf->global->$key;
+}
 
 
 // Appel des triggers
@@ -144,11 +156,16 @@ 
 	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
 	    if (preg_match('/\d\.\d/', $appli))
 	    {
-	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) {
+	        	$appli.=" (".DOL_VERSION.")";
+	        }
+	        // If new title contains a version that is different than core
+	    } else {
+	    	$appli.=" ".DOL_VERSION;
 	    }
-	    else $appli.=" ".DOL_VERSION;
+	} else {
+		$appli.=" ".DOL_VERSION;
 	}
-	else $appli.=" ".DOL_VERSION;
 
 	$urlback=$_SERVER["REQUEST_URI"];
 	$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentReceived");
@@ -161,8 +178,7 @@ 
 		$content.=$langs->trans("PaymentSubscription")."<br>\n";
 		$content.=$langs->trans("MemberId").': '.$tmptag['MEM']."<br>\n";
 		$content.=$langs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
-	}
-	else
+	} else
 	{
 		$content.=$langs->transnoentitiesnoconv("NewOnlinePaymentReceived")."<br>\n";
 	}
@@ -182,8 +198,7 @@ 
 	if ($result)
 	{
 		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paybox');
-	}
-	else
+	} else
 	{
 		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paybox');
 	}

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/demo/index.php

Indentation +168 added lines, -168 removed lines

@@ -98,12 +98,12 @@ 
 		'icon'=>DOL_URL_ROOT.'/public/demo/demo-profile-foundation.jpg',
 		'url'=>$url
 		),
-	    // All demo profile
-	    array('default'=>'0', 'key'=>'profdemoall','label'=>'ChooseYourDemoProfilMore',
+		// All demo profile
+		array('default'=>'0', 'key'=>'profdemoall','label'=>'ChooseYourDemoProfilMore',
 		'disablemodules'=>'adherent,don,externalsite,mailmanspip',
-	    //'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot9.png'
+		//'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot9.png'
 		'icon'=>DOL_URL_ROOT.'/public/demo/demo-profile-all.jpg'
-	    )
+		)
 	);
 
 
@@ -113,12 +113,12 @@ 
 	// Not visible
 	$alwayshiddencheckedmodules=array('accounting','api','barcode','bookmark','clicktodial','comptabilite','cron','document','domain','externalrss','externalsite','fckeditor','geoipmaxmind','gravatar','label','ldap',
 									'mailmanspip','notification','oauth','syslog','user','webservices',
-	                                // Extended modules
-	                                'memcached','numberwords','zipautofillfr');
+									// Extended modules
+									'memcached','numberwords','zipautofillfr');
 	$alwayshiddenuncheckedmodules=array('ftp','hrm','webservicesclient','websites',
-	                                // Extended modules
-	                                'awstats','bittorrent','bootstrap','cabinetmed','cmcic','concatpdf','customfield','deplacement','dolicloud','filemanager','lightbox','mantis','monitoring','moretemplates','multicompany','nltechno','numberingpack','openstreetmap',
-	                                'ovh','phenix','phpsysinfo','pibarcode','postnuke','selectbank','skincoloreditor','submiteverywhere','survey','thomsonphonebook','topten','tvacerfa','voyage','webcalendar','webmail');
+									// Extended modules
+									'awstats','bittorrent','bootstrap','cabinetmed','cmcic','concatpdf','customfield','deplacement','dolicloud','filemanager','lightbox','mantis','monitoring','moretemplates','multicompany','nltechno','numberingpack','openstreetmap',
+									'ovh','phenix','phpsysinfo','pibarcode','postnuke','selectbank','skincoloreditor','submiteverywhere','survey','thomsonphonebook','topten','tvacerfa','voyage','webcalendar','webmail');
 }
 
 // Search modules
@@ -139,61 +139,61 @@ 
 
 foreach ($modulesdir as $dir)
 {
-    // Charge tableaux modules, nom, numero, orders depuis repertoire dir
-    $handle=@opendir($dir);
-    if (is_resource($handle))
-    {
-        while (($file = readdir($handle))!==false)
-        {
-            //print "$i ".$file."\n<br>";
-            if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod'  && substr($file, dol_strlen($file) - 10) == '.class.php')
-            {
-                $modName = substr($file, 0, dol_strlen($file) - 10);
-
-                if ($modName)
-                {
-		            try
-		            {
-                        include_once $dir.$file;
-                        $objMod = new $modName($db);
-
-                        if ($objMod->numero > 0)
-                        {
-                            $j = $objMod->numero;
-                        }
-                        else
-                        {
-                            $j = 1000 + $i;
-                        }
-
-                        $modulequalified=1;
-
-                        // We discard modules according to features level (PS: if module is activated we always show it)
-                        $const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',get_class($objMod)));
-                        if ($objMod->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2 && empty($conf->global->$const_name)) $modulequalified=0;
-                        if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && empty($conf->global->$const_name)) $modulequalified=0;
-
-                        if ($modulequalified)
-                        {
-                            $modules[$i] = $objMod;
-                            $filename[$i]= $modName;
-                            $orders[$i]  = $objMod->family."_".$j;   // Tri par famille puis numero module
-                            //print "x".$modName." ".$orders[$i]."\n<br>";
-       						if (isset($categ[$objMod->special])) $categ[$objMod->special]++;					// Array of all different modules categories
-       			            else $categ[$objMod->special]=1;
-                            $dirmod[$i] = $dirroot;
-                            $j++;
-                            $i++;
-                        }
-		            }
-                    catch(Exception $e)
-                    {
-                        dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
-                    }
-                }
-            }
-        }
-    }
+	// Charge tableaux modules, nom, numero, orders depuis repertoire dir
+	$handle=@opendir($dir);
+	if (is_resource($handle))
+	{
+		while (($file = readdir($handle))!==false)
+		{
+			//print "$i ".$file."\n<br>";
+			if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod'  && substr($file, dol_strlen($file) - 10) == '.class.php')
+			{
+				$modName = substr($file, 0, dol_strlen($file) - 10);
+
+				if ($modName)
+				{
+					try
+					{
+						include_once $dir.$file;
+						$objMod = new $modName($db);
+
+						if ($objMod->numero > 0)
+						{
+							$j = $objMod->numero;
+						}
+						else
+						{
+							$j = 1000 + $i;
+						}
+
+						$modulequalified=1;
+
+						// We discard modules according to features level (PS: if module is activated we always show it)
+						$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',get_class($objMod)));
+						if ($objMod->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2 && empty($conf->global->$const_name)) $modulequalified=0;
+						if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && empty($conf->global->$const_name)) $modulequalified=0;
+
+						if ($modulequalified)
+						{
+							$modules[$i] = $objMod;
+							$filename[$i]= $modName;
+							$orders[$i]  = $objMod->family."_".$j;   // Tri par famille puis numero module
+							//print "x".$modName." ".$orders[$i]."\n<br>";
+	   						if (isset($categ[$objMod->special])) $categ[$objMod->special]++;					// Array of all different modules categories
+	   						else $categ[$objMod->special]=1;
+							$dirmod[$i] = $dirroot;
+							$j++;
+							$i++;
+						}
+					}
+					catch(Exception $e)
+					{
+						dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
+					}
+				}
+			}
+		}
+	}
 }
 
 asort($orders);
@@ -211,32 +211,32 @@ 
 	// If we disable modules using a profile choice
 	if (GETPOST("demochoice"))
 	{
-    	foreach ($demoprofiles as $profilearray)
-    	{
-    		if ($profilearray['key'] == GETPOST("demochoice"))
-    		{
-    			$disablestring=$profilearray['disablemodules'];
-    			break;
-    		}
-    	}
+		foreach ($demoprofiles as $profilearray)
+		{
+			if ($profilearray['key'] == GETPOST("demochoice"))
+			{
+				$disablestring=$profilearray['disablemodules'];
+				break;
+			}
+		}
 	}
 	// If we disable modules using personalized list
 	foreach($modules as $val)
 	{
-	    $modulekeyname=strtolower($val->name);
-	    if (empty($_POST[$modulekeyname]) && empty($val->always_enabled) && ! in_array($modulekeyname,$alwayscheckedmodules))
-	    {
-	        $disablestring.=$modulekeyname.',';
-	        if ($modulekeyname=='propale') $disablestring.='propal,';
-	    }
+		$modulekeyname=strtolower($val->name);
+		if (empty($_POST[$modulekeyname]) && empty($val->always_enabled) && ! in_array($modulekeyname,$alwayscheckedmodules))
+		{
+			$disablestring.=$modulekeyname.',';
+			if ($modulekeyname=='propale') $disablestring.='propal,';
+		}
 	}
 
-    // Do redirect to login page
+	// Do redirect to login page
 	if ($disablestring)
 	{
 		if (GETPOST('urlfrom')) $url.=(preg_match('/\?/',$url)?'&amp;':'?').'urlfrom='.urlencode(GETPOST('urlfrom','alpha'));
 		$url.=(preg_match('/\?/',$url)?'&amp;':'?').'disablemodules='.$disablestring;
-        //var_dump($url);exit;
+		//var_dump($url);exit;
 		header("Location: ".$url);
 		exit;
 	}
@@ -304,49 +304,49 @@ 
 {
 	if ($profilearray['default'] >= 0)
 	{
-	    //print $profilearray['lang'];
-	    if (! empty($profilearray['lang'])) $langs->load($profilearray['lang']);
+		//print $profilearray['lang'];
+		if (! empty($profilearray['lang'])) $langs->load($profilearray['lang']);
 
 		$url=$_SERVER["PHP_SELF"].'?action=gotodemo';
 		$urlwithmod=$url.'&amp;demochoice='.$profilearray['key'];
 		// Should work with DOL_URL_ROOT='' or DOL_URL_ROOT='/dolibarr'
 		//print "xx".$_SERVER["PHP_SELF"].' '.DOL_URL_ROOT.'<br>';
 
-        $urlfrom=preg_replace('/^'.preg_quote(DOL_URL_ROOT,'/').'/i','',$_SERVER["PHP_SELF"]);
+		$urlfrom=preg_replace('/^'.preg_quote(DOL_URL_ROOT,'/').'/i','',$_SERVER["PHP_SELF"]);
 		//print $urlfrom;
 
 		if (! empty($profilearray['url']))
 		{
-		    $urlwithmod=$profilearray['url'];
-		    $urlwithmod=$urlwithmod.(preg_match('/\?/',$urlwithmod)?'&amp;':'?').'urlfrom='.urlencode($urlfrom);
-		    if (! empty($profilearray['disablemodules']))
-		    {
-		          $urlwithmod=$urlwithmod.(preg_match('/\?/',$urlwithmod)?'&amp;':'?').'disablemodules='.$profilearray['disablemodules'];
-		    }
+			$urlwithmod=$profilearray['url'];
+			$urlwithmod=$urlwithmod.(preg_match('/\?/',$urlwithmod)?'&amp;':'?').'urlfrom='.urlencode($urlfrom);
+			if (! empty($profilearray['disablemodules']))
+			{
+				  $urlwithmod=$urlwithmod.(preg_match('/\?/',$urlwithmod)?'&amp;':'?').'disablemodules='.$profilearray['disablemodules'];
+			}
 		}
 
 		if (empty($profilearray['url']))
 		{
-		    print '<div class="clearboth"></div>';
+			print '<div class="clearboth"></div>';
 		}
 
 		print '<form method="POST" class="valigntop inline-block" name="form'.$profilearray['key'].'" action="'.$_SERVER["PHP_SELF"].'#a1'.$profilearray['key'].'">'."\n";
 		print '<input type="hidden" name="action" value="gotodemo">'."\n";
-        print '<input type="hidden" name="urlfrom" value="'.dol_escape_htmltag($urlfrom).'">'."\n";
-        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
-        print '<input type="hidden" name="username" value="demo">'."\n";
-        print '<input type="hidden" name="dol_hide_topmenu" value="'.$conf->dol_hide_topmenu.'">'."\n";
-        print '<input type="hidden" name="dol_hide_leftmenu" value="'.$conf->dol_hide_leftmenu.'">'."\n";
-        print '<input type="hidden" name="dol_optimize_smallscreen" value="'.$conf->dol_optimize_smallscreen.'">'."\n";
-        print '<input type="hidden" name="dol_no_mouse_hover" value="'.$conf->dol_no_mouse_hover.'">'."\n";
-        print '<input type="hidden" name="dol_use_jmobile" value="'.$conf->dol_use_jmobile.'">'."\n";
+		print '<input type="hidden" name="urlfrom" value="'.dol_escape_htmltag($urlfrom).'">'."\n";
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
+		print '<input type="hidden" name="username" value="demo">'."\n";
+		print '<input type="hidden" name="dol_hide_topmenu" value="'.$conf->dol_hide_topmenu.'">'."\n";
+		print '<input type="hidden" name="dol_hide_leftmenu" value="'.$conf->dol_hide_leftmenu.'">'."\n";
+		print '<input type="hidden" name="dol_optimize_smallscreen" value="'.$conf->dol_optimize_smallscreen.'">'."\n";
+		print '<input type="hidden" name="dol_no_mouse_hover" value="'.$conf->dol_no_mouse_hover.'">'."\n";
+		print '<input type="hidden" name="dol_use_jmobile" value="'.$conf->dol_use_jmobile.'">'."\n";
 
-        print '<div summary="Dolibarr online demonstration for profile '.$profilearray['label'].'" class="center inline-block CTable CTableRow'.($i%2==0?'1':'0').'" style="width: 346px;">'."\n";
+		print '<div summary="Dolibarr online demonstration for profile '.$profilearray['label'].'" class="center inline-block CTable CTableRow'.($i%2==0?'1':'0').'" style="width: 346px;">'."\n";
 
 
-        print '<div id="a1'.$profilearray['key'].'" class="demobox '.(empty($profilearray['url'])?'modulelineshow cursorpointer':'nomodulelines').'">';
+		print '<div id="a1'.$profilearray['key'].'" class="demobox '.(empty($profilearray['url'])?'modulelineshow cursorpointer':'nomodulelines').'">';
 
-        print '<a href="'.$urlwithmod.'" class="'.(empty($profilearray['url'])?'modulelineshow':'nomodulelines').'">';
+		print '<a href="'.$urlwithmod.'" class="'.(empty($profilearray['url'])?'modulelineshow':'nomodulelines').'">';
 		print '<div style="padding: 10px;">';
 
 		print '<img class="demothumb" src="'.$profilearray['icon'].'" alt="Demo '.$profilearray['label'].'">';
@@ -354,69 +354,69 @@ 
 		print '<div class="clearboth"></div>';
 
 		print '<div class="demothumbtext">';
-    	print $langs->trans($profilearray['label']);
-    	print '</div>';
+		print $langs->trans($profilearray['label']);
+		print '</div>';
 
-    	print '</div>';
-    	print '</a>';
+		print '</div>';
+		print '</a>';
 
 
-        // Modules (a profile you must choose modules)
-        if (empty($profilearray['url']))
-        {
-    		print '<div id="tr1'.$profilearray['key'].'" class="moduleline hidden" style="margin-left: 8px; margin-right: 8px; text-align: justify; font-size:14px; line-height: 130%; padding-bottom: 8px">';
-
-    		print $langs->trans("ThisIsListOfModules").'<br><br>';
-
-    		print '<div class="csscolumns">';
-
-    		$listofdisabledmodules=explode(',',$profilearray['disablemodules']);
-    		$j=0;
-    		$nbcolsmod=empty($conf->dol_optimize_smallscreen)?4:3;
-    		//var_dump($modules);
-    		foreach($orders as $index => $key) // Loop on qualified (enabled) modules
-    		{
-    			//print $index.' '.$key;
-    			$val = $modules[$index];
-    		    $modulekeyname=strtolower($val->name);
-
-    		    $modulequalified=1;
-                if (! empty($val->always_enabled) || in_array($modulekeyname,$alwayshiddenuncheckedmodules)) $modulequalified=0;
-                if ($val->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2 && ! $conf->global->$const_name) $modulequalified=0;
-                if ($val->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && ! $conf->global->$const_name) $modulequalified=0;
-                if (! $modulequalified) continue;
-
-                if (in_array($modulekeyname,$alwayshiddencheckedmodules))
-                {
-                    print "\n".'<!-- Module '.$modulekeyname.' hidden and always checked -->';
-                    print '<input type="hidden" name="'.$modulekeyname.'" value="1">';
-                }
-                else
-                {
-                    $modulo=($j % $nbcolsmod);
-        		    //if ($modulo == 0) print '<tr>';
-                    print '<!-- id='.$val->numero.' -->';
-                    print '<div class="nowrap">';
-                    print '<input type="checkbox" class="checkbox" name="'.$modulekeyname.'" value="1"';
-                    if (in_array($modulekeyname,$alwaysuncheckedmodules)) print ' disabled';
-                    if (! in_array($modulekeyname,$alwaysuncheckedmodules)  && (! in_array($modulekeyname,$listofdisabledmodules) || in_array($modulekeyname,$alwayscheckedmodules))) print ' checked';
-                    print '> <div class="inline-block demomaxoveflow">'.$val->getName().'</div><br>';
-                    print '</div>';
-                    //if ($modulo == ($nbcolsmod - 1)) print '</tr>';
-                    $j++;
-                }
-    		}
-
-    		print '</div>';
-
-		    print '<br><div class="center">';
-		    print '<input type="submit" value=" &nbsp; &nbsp; '.$langs->trans("Start").' &nbsp; &nbsp; " class="button">';
-		    print '</div>';
-
-		    print '</div>';
-        }
+		// Modules (a profile you must choose modules)
+		if (empty($profilearray['url']))
+		{
+			print '<div id="tr1'.$profilearray['key'].'" class="moduleline hidden" style="margin-left: 8px; margin-right: 8px; text-align: justify; font-size:14px; line-height: 130%; padding-bottom: 8px">';
+
+			print $langs->trans("ThisIsListOfModules").'<br><br>';
+
+			print '<div class="csscolumns">';
+
+			$listofdisabledmodules=explode(',',$profilearray['disablemodules']);
+			$j=0;
+			$nbcolsmod=empty($conf->dol_optimize_smallscreen)?4:3;
+			//var_dump($modules);
+			foreach($orders as $index => $key) // Loop on qualified (enabled) modules
+			{
+				//print $index.' '.$key;
+				$val = $modules[$index];
+				$modulekeyname=strtolower($val->name);
+
+				$modulequalified=1;
+				if (! empty($val->always_enabled) || in_array($modulekeyname,$alwayshiddenuncheckedmodules)) $modulequalified=0;
+				if ($val->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2 && ! $conf->global->$const_name) $modulequalified=0;
+				if ($val->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && ! $conf->global->$const_name) $modulequalified=0;
+				if (! $modulequalified) continue;
+
+				if (in_array($modulekeyname,$alwayshiddencheckedmodules))
+				{
+					print "\n".'<!-- Module '.$modulekeyname.' hidden and always checked -->';
+					print '<input type="hidden" name="'.$modulekeyname.'" value="1">';
+				}
+				else
+				{
+					$modulo=($j % $nbcolsmod);
+					//if ($modulo == 0) print '<tr>';
+					print '<!-- id='.$val->numero.' -->';
+					print '<div class="nowrap">';
+					print '<input type="checkbox" class="checkbox" name="'.$modulekeyname.'" value="1"';
+					if (in_array($modulekeyname,$alwaysuncheckedmodules)) print ' disabled';
+					if (! in_array($modulekeyname,$alwaysuncheckedmodules)  && (! in_array($modulekeyname,$listofdisabledmodules) || in_array($modulekeyname,$alwayscheckedmodules))) print ' checked';
+					print '> <div class="inline-block demomaxoveflow">'.$val->getName().'</div><br>';
+					print '</div>';
+					//if ($modulo == ($nbcolsmod - 1)) print '</tr>';
+					$j++;
+				}
+			}
+
+			print '</div>';
+
+			print '<br><div class="center">';
+			print '<input type="submit" value=" &nbsp; &nbsp; '.$langs->trans("Start").' &nbsp; &nbsp; " class="button">';
+			print '</div>';
+
+			print '</div>';
+		}
 
-        print '</div></div>';
+		print '</div></div>';
 		print '</form>'."\n";
 
 		$i++;
@@ -465,13 +465,13 @@ 
  */
 function llxHeaderVierge($title, $head = "")
 {
-    global $user, $conf, $langs;
+	global $user, $conf, $langs;
 
-    top_httphead();
+	top_httphead();
 
-    top_htmlhead($head,$title,0,0,array(),array('public/demo/demo.css'));
+	top_htmlhead($head,$title,0,0,array(),array('public/demo/demo.css'));
 
-    print '<body class="demobody"><div class="demobackgrounddiv">'."\n";
+	print '<body class="demobody"><div class="demobackgrounddiv">'."\n";
 }
 
 /**
@@ -481,10 +481,10 @@ 
  */
 function llxFooterVierge()
 {
-    printCommonFooter('public');
+	printCommonFooter('public');
 
-    print "\n";
-    print "</div></body>\n";
-    print "</html>\n";
+	print "\n";
+	print "</div></body>\n";
+	print "</html>\n";
 }
 

Spacing +98 added lines, -98 removed lines

@@ -25,8 +25,8 @@ 
  *		\author	    Laurent Destailleur
  */
 
-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 '../../main.inc.php';
 require_once '../../core/lib/functions2.lib.php';
@@ -35,71 +35,71 @@ 
 $langs->load("install");
 $langs->load("other");
 
-$conf->dol_hide_topmenu=GETPOST('dol_hide_topmenu','int');
-$conf->dol_hide_leftmenu=GETPOST('dol_hide_leftmenu','int');
-$conf->dol_optimize_smallscreen=GETPOST('dol_optimize_smallscreen','int');
-$conf->dol_no_mouse_hover=GETPOST('dol_no_mouse_hover','int');
-$conf->dol_use_jmobile=GETPOST('dol_use_jmobile','int');
+$conf->dol_hide_topmenu = GETPOST('dol_hide_topmenu', 'int');
+$conf->dol_hide_leftmenu = GETPOST('dol_hide_leftmenu', 'int');
+$conf->dol_optimize_smallscreen = GETPOST('dol_optimize_smallscreen', 'int');
+$conf->dol_no_mouse_hover = GETPOST('dol_no_mouse_hover', 'int');
+$conf->dol_use_jmobile = GETPOST('dol_use_jmobile', 'int');
 
 // Security check
 global $dolibarr_main_demo;
-if (empty($dolibarr_main_demo)) accessforbidden('Parameter dolibarr_main_demo must be defined in conf file with value "default login,default pass" to enable the demo entry page',0,0,1);
+if (empty($dolibarr_main_demo)) accessforbidden('Parameter dolibarr_main_demo must be defined in conf file with value "default login,default pass" to enable the demo entry page', 0, 0, 1);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$res=$hookmanager->initHooks(array('demo'));
-
-$demoprofiles=array();
-$alwayscheckedmodules=array();
-$alwaysuncheckedmodules=array();
-$alwayshiddencheckedmodules=array();
-$alwayshiddenuncheckedmodules=array();
-
-$url='';
-$url.=($url?'&':'').($conf->dol_hide_topmenu?'dol_hide_topmenu='.$conf->dol_hide_topmenu:'');
-$url.=($url?'&':'').($conf->dol_hide_leftmenu?'dol_hide_leftmenu='.$conf->dol_hide_leftmenu:'');
-$url.=($url?'&':'').($conf->dol_optimize_smallscreen?'dol_optimize_smallscreen='.$conf->dol_optimize_smallscreen:'');
-$url.=($url?'&':'').($conf->dol_no_mouse_hover?'dol_no_mouse_hover='.$conf->dol_no_mouse_hover:'');
-$url.=($url?'&':'').($conf->dol_use_jmobile?'dol_use_jmobile='.$conf->dol_use_jmobile:'');
-$url=DOL_URL_ROOT.'/index.php'.($url?'?'.$url:'');
+$res = $hookmanager->initHooks(array('demo'));
+
+$demoprofiles = array();
+$alwayscheckedmodules = array();
+$alwaysuncheckedmodules = array();
+$alwayshiddencheckedmodules = array();
+$alwayshiddenuncheckedmodules = array();
+
+$url = '';
+$url .= ($url ? '&' : '').($conf->dol_hide_topmenu ? 'dol_hide_topmenu='.$conf->dol_hide_topmenu : '');
+$url .= ($url ? '&' : '').($conf->dol_hide_leftmenu ? 'dol_hide_leftmenu='.$conf->dol_hide_leftmenu : '');
+$url .= ($url ? '&' : '').($conf->dol_optimize_smallscreen ? 'dol_optimize_smallscreen='.$conf->dol_optimize_smallscreen : '');
+$url .= ($url ? '&' : '').($conf->dol_no_mouse_hover ? 'dol_no_mouse_hover='.$conf->dol_no_mouse_hover : '');
+$url .= ($url ? '&' : '').($conf->dol_use_jmobile ? 'dol_use_jmobile='.$conf->dol_use_jmobile : '');
+$url = DOL_URL_ROOT.'/index.php'.($url ? '?'.$url : '');
 
 $tmpaction = 'view';
-$parameters=array();
-$object=new stdClass();
-$reshook=$hookmanager->executeHooks('addDemoProfile', $parameters, $object, $tmpaction);    // Note that $action and $object may have been modified by some hooks
-$error=$hookmanager->error; $errors=$hookmanager->errors;
+$parameters = array();
+$object = new stdClass();
+$reshook = $hookmanager->executeHooks('addDemoProfile', $parameters, $object, $tmpaction); // Note that $action and $object may have been modified by some hooks
+$error = $hookmanager->error; $errors = $hookmanager->errors;
 if (empty($reshook))
 {
-	$demoprofiles=array(
-		array('default'=>'1', 'key'=>'profdemoservonly','label'=>'DemoCompanyServiceOnly',
+	$demoprofiles = array(
+		array('default'=>'1', 'key'=>'profdemoservonly', 'label'=>'DemoCompanyServiceOnly',
 		'disablemodules'=>'adherent,barcode,cashdesk,don,expedition,externalsite,incoterm,mailmanspip,margin,prelevement,product,productbatch,stock',
 		//'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot8.png',
 		'icon'=>DOL_URL_ROOT.'/public/demo/demo-profile-service.jpg',
 		'url'=>$url
 		),
-		array('default'=>'-1','key'=>'profdemoshopwithdesk','label'=>'DemoCompanyShopWithCashDesk',
+		array('default'=>'-1', 'key'=>'profdemoshopwithdesk', 'label'=>'DemoCompanyShopWithCashDesk',
 		'disablemodules'=>'adherent,don,externalsite,ficheinter,incoterm,mailmanspip,prelevement,product,productbatch,stock',
 		'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot2.png',
 		'url'=>$url
 		),
-		array('default'=>'0', 'key'=>'profdemoprodstock','label'=>'DemoCompanyProductAndStocks',
+		array('default'=>'0', 'key'=>'profdemoprodstock', 'label'=>'DemoCompanyProductAndStocks',
 		'disablemodules'=>'adherent,contrat,don,externalsite,ficheinter,mailmanspip,prelevement,service',
 		//'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot2.png',
 		'icon'=>DOL_URL_ROOT.'/public/demo/demo-profile-product.jpg',
 		'url'=>$url
 		),
-		array('default'=>'-1', 'key'=>'profdemofun','label'=>'DemoFundation',
+		array('default'=>'-1', 'key'=>'profdemofun', 'label'=>'DemoFundation',
 		'disablemodules'=>'banque,barcode,cashdesk,commande,commercial,compta,comptabilite,contrat,expedition,externalsite,ficheinter,incoterm,mailmanspip,margin,prelevement,product,productbatch,projet,propal,propale,service,societe,stock,tax',
 		'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot6.png',
 		'url'=>$url
 		),
-		array('default'=>'0', 'key'=>'profdemofun2','label'=>'DemoFundation2',
+		array('default'=>'0', 'key'=>'profdemofun2', 'label'=>'DemoFundation2',
 		'disablemodules'=>'barcode,cashdesk,commande,commercial,compta,comptabilite,contrat,expedition,externalsite,ficheinter,incoterm,mailmanspip,margin,prelevement,product,productbatch,projet,propal,propale,service,societe,stock,tax',
 		//'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot6.png',
 		'icon'=>DOL_URL_ROOT.'/public/demo/demo-profile-foundation.jpg',
 		'url'=>$url
 		),
 	    // All demo profile
-	    array('default'=>'0', 'key'=>'profdemoall','label'=>'ChooseYourDemoProfilMore',
+	    array('default'=>'0', 'key'=>'profdemoall', 'label'=>'ChooseYourDemoProfilMore',
 		'disablemodules'=>'adherent,don,externalsite,mailmanspip',
 	    //'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot9.png'
 		'icon'=>DOL_URL_ROOT.'/public/demo/demo-profile-all.jpg'
@@ -108,21 +108,21 @@ 
 
 
 	// Visible
-	$alwayscheckedmodules=array('barcode','bookmark','categorie','externalrss','fckeditor','geoipmaxmind','gravatar','memcached','syslog','user','webservices');  // Technical module we always want
-	$alwaysuncheckedmodules=array('dynamicprices','loan','multicurrency','paybox','paypal','stripe','google','printing','scanner','workflow');  // Module we never want
+	$alwayscheckedmodules = array('barcode', 'bookmark', 'categorie', 'externalrss', 'fckeditor', 'geoipmaxmind', 'gravatar', 'memcached', 'syslog', 'user', 'webservices'); // Technical module we always want
+	$alwaysuncheckedmodules = array('dynamicprices', 'loan', 'multicurrency', 'paybox', 'paypal', 'stripe', 'google', 'printing', 'scanner', 'workflow'); // Module we never want
 	// Not visible
-	$alwayshiddencheckedmodules=array('accounting','api','barcode','bookmark','clicktodial','comptabilite','cron','document','domain','externalrss','externalsite','fckeditor','geoipmaxmind','gravatar','label','ldap',
-									'mailmanspip','notification','oauth','syslog','user','webservices',
+	$alwayshiddencheckedmodules = array('accounting', 'api', 'barcode', 'bookmark', 'clicktodial', 'comptabilite', 'cron', 'document', 'domain', 'externalrss', 'externalsite', 'fckeditor', 'geoipmaxmind', 'gravatar', 'label', 'ldap',
+									'mailmanspip', 'notification', 'oauth', 'syslog', 'user', 'webservices',
 	                                // Extended modules
-	                                'memcached','numberwords','zipautofillfr');
-	$alwayshiddenuncheckedmodules=array('ftp','hrm','webservicesclient','websites',
+	                                'memcached', 'numberwords', 'zipautofillfr');
+	$alwayshiddenuncheckedmodules = array('ftp', 'hrm', 'webservicesclient', 'websites',
 	                                // Extended modules
-	                                'awstats','bittorrent','bootstrap','cabinetmed','cmcic','concatpdf','customfield','deplacement','dolicloud','filemanager','lightbox','mantis','monitoring','moretemplates','multicompany','nltechno','numberingpack','openstreetmap',
-	                                'ovh','phenix','phpsysinfo','pibarcode','postnuke','selectbank','skincoloreditor','submiteverywhere','survey','thomsonphonebook','topten','tvacerfa','voyage','webcalendar','webmail');
+	                                'awstats', 'bittorrent', 'bootstrap', 'cabinetmed', 'cmcic', 'concatpdf', 'customfield', 'deplacement', 'dolicloud', 'filemanager', 'lightbox', 'mantis', 'monitoring', 'moretemplates', 'multicompany', 'nltechno', 'numberingpack', 'openstreetmap',
+	                                'ovh', 'phenix', 'phpsysinfo', 'pibarcode', 'postnuke', 'selectbank', 'skincoloreditor', 'submiteverywhere', 'survey', 'thomsonphonebook', 'topten', 'tvacerfa', 'voyage', 'webcalendar', 'webmail');
 }
 
 // Search modules
-$dirlist=$conf->file->dol_document_root;
+$dirlist = $conf->file->dol_document_root;
 
 
 // Search modules dirs
@@ -140,13 +140,13 @@ 
 foreach ($modulesdir as $dir)
 {
     // Charge tableaux modules, nom, numero, orders depuis repertoire dir
-    $handle=@opendir($dir);
+    $handle = @opendir($dir);
     if (is_resource($handle))
     {
-        while (($file = readdir($handle))!==false)
+        while (($file = readdir($handle)) !== false)
         {
             //print "$i ".$file."\n<br>";
-            if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod'  && substr($file, dol_strlen($file) - 10) == '.class.php')
+            if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php')
             {
                 $modName = substr($file, 0, dol_strlen($file) - 10);
 
@@ -166,27 +166,27 @@ 
                             $j = 1000 + $i;
                         }
 
-                        $modulequalified=1;
+                        $modulequalified = 1;
 
                         // We discard modules according to features level (PS: if module is activated we always show it)
-                        $const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',get_class($objMod)));
-                        if ($objMod->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2 && empty($conf->global->$const_name)) $modulequalified=0;
-                        if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && empty($conf->global->$const_name)) $modulequalified=0;
+                        $const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));
+                        if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && empty($conf->global->$const_name)) $modulequalified = 0;
+                        if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && empty($conf->global->$const_name)) $modulequalified = 0;
 
                         if ($modulequalified)
                         {
                             $modules[$i] = $objMod;
-                            $filename[$i]= $modName;
-                            $orders[$i]  = $objMod->family."_".$j;   // Tri par famille puis numero module
+                            $filename[$i] = $modName;
+                            $orders[$i]  = $objMod->family."_".$j; // Tri par famille puis numero module
                             //print "x".$modName." ".$orders[$i]."\n<br>";
-       						if (isset($categ[$objMod->special])) $categ[$objMod->special]++;					// Array of all different modules categories
-       			            else $categ[$objMod->special]=1;
+       						if (isset($categ[$objMod->special])) $categ[$objMod->special]++; // Array of all different modules categories
+       			            else $categ[$objMod->special] = 1;
                             $dirmod[$i] = $dirroot;
                             $j++;
                             $i++;
                         }
 		            }
-                    catch(Exception $e)
+                    catch (Exception $e)
                     {
                         dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
                     }
@@ -204,10 +204,10 @@ 
  * Actions
  */
 
-if (GETPOST('action','aZ09') == 'gotodemo')     // Action run when we click on "Start" after selection modules
+if (GETPOST('action', 'aZ09') == 'gotodemo')     // Action run when we click on "Start" after selection modules
 {
 	//print 'ee'.GETPOST("demochoice");
-	$disablestring='';
+	$disablestring = '';
 	// If we disable modules using a profile choice
 	if (GETPOST("demochoice"))
 	{
@@ -215,27 +215,27 @@ 
     	{
     		if ($profilearray['key'] == GETPOST("demochoice"))
     		{
-    			$disablestring=$profilearray['disablemodules'];
+    			$disablestring = $profilearray['disablemodules'];
     			break;
     		}
     	}
 	}
 	// If we disable modules using personalized list
-	foreach($modules as $val)
+	foreach ($modules as $val)
 	{
-	    $modulekeyname=strtolower($val->name);
-	    if (empty($_POST[$modulekeyname]) && empty($val->always_enabled) && ! in_array($modulekeyname,$alwayscheckedmodules))
+	    $modulekeyname = strtolower($val->name);
+	    if (empty($_POST[$modulekeyname]) && empty($val->always_enabled) && !in_array($modulekeyname, $alwayscheckedmodules))
 	    {
-	        $disablestring.=$modulekeyname.',';
-	        if ($modulekeyname=='propale') $disablestring.='propal,';
+	        $disablestring .= $modulekeyname.',';
+	        if ($modulekeyname == 'propale') $disablestring .= 'propal,';
 	    }
 	}
 
     // Do redirect to login page
 	if ($disablestring)
 	{
-		if (GETPOST('urlfrom')) $url.=(preg_match('/\?/',$url)?'&amp;':'?').'urlfrom='.urlencode(GETPOST('urlfrom','alpha'));
-		$url.=(preg_match('/\?/',$url)?'&amp;':'?').'disablemodules='.$disablestring;
+		if (GETPOST('urlfrom')) $url .= (preg_match('/\?/', $url) ? '&amp;' : '?').'urlfrom='.urlencode(GETPOST('urlfrom', 'alpha'));
+		$url .= (preg_match('/\?/', $url) ? '&amp;' : '?').'disablemodules='.$disablestring;
         //var_dump($url);exit;
 		header("Location: ".$url);
 		exit;
@@ -247,11 +247,11 @@ 
  * View
  */
 
-$head='';
-$head.='<meta name="keywords" content="demo,online,demonstration,example,test,erp,crm,demos,web">'."\n";
-$head.='<meta name="description" content="Dolibarr ERP and CRM demo. You can test here several profiles for Dolibarr ERP and CRM demonstration.">'."\n";
+$head = '';
+$head .= '<meta name="keywords" content="demo,online,demonstration,example,test,erp,crm,demos,web">'."\n";
+$head .= '<meta name="description" content="Dolibarr ERP and CRM demo. You can test here several profiles for Dolibarr ERP and CRM demonstration.">'."\n";
 
-$head.='
+$head .= '
 <script type="text/javascript">
 var openedId="";
 jQuery(document).ready(function () {
@@ -299,29 +299,29 @@ 
 print '<div class="clearboth"></div>';
 print '<div class="demobanbox">';
 
-$i=0;
+$i = 0;
 foreach ($demoprofiles as $profilearray)
 {
 	if ($profilearray['default'] >= 0)
 	{
 	    //print $profilearray['lang'];
-	    if (! empty($profilearray['lang'])) $langs->load($profilearray['lang']);
+	    if (!empty($profilearray['lang'])) $langs->load($profilearray['lang']);
 
-		$url=$_SERVER["PHP_SELF"].'?action=gotodemo';
-		$urlwithmod=$url.'&amp;demochoice='.$profilearray['key'];
+		$url = $_SERVER["PHP_SELF"].'?action=gotodemo';
+		$urlwithmod = $url.'&amp;demochoice='.$profilearray['key'];
 		// Should work with DOL_URL_ROOT='' or DOL_URL_ROOT='/dolibarr'
 		//print "xx".$_SERVER["PHP_SELF"].' '.DOL_URL_ROOT.'<br>';
 
-        $urlfrom=preg_replace('/^'.preg_quote(DOL_URL_ROOT,'/').'/i','',$_SERVER["PHP_SELF"]);
+        $urlfrom = preg_replace('/^'.preg_quote(DOL_URL_ROOT, '/').'/i', '', $_SERVER["PHP_SELF"]);
 		//print $urlfrom;
 
-		if (! empty($profilearray['url']))
+		if (!empty($profilearray['url']))
 		{
-		    $urlwithmod=$profilearray['url'];
-		    $urlwithmod=$urlwithmod.(preg_match('/\?/',$urlwithmod)?'&amp;':'?').'urlfrom='.urlencode($urlfrom);
-		    if (! empty($profilearray['disablemodules']))
+		    $urlwithmod = $profilearray['url'];
+		    $urlwithmod = $urlwithmod.(preg_match('/\?/', $urlwithmod) ? '&amp;' : '?').'urlfrom='.urlencode($urlfrom);
+		    if (!empty($profilearray['disablemodules']))
 		    {
-		          $urlwithmod=$urlwithmod.(preg_match('/\?/',$urlwithmod)?'&amp;':'?').'disablemodules='.$profilearray['disablemodules'];
+		          $urlwithmod = $urlwithmod.(preg_match('/\?/', $urlwithmod) ? '&amp;' : '?').'disablemodules='.$profilearray['disablemodules'];
 		    }
 		}
 
@@ -341,12 +341,12 @@ 
         print '<input type="hidden" name="dol_no_mouse_hover" value="'.$conf->dol_no_mouse_hover.'">'."\n";
         print '<input type="hidden" name="dol_use_jmobile" value="'.$conf->dol_use_jmobile.'">'."\n";
 
-        print '<div summary="Dolibarr online demonstration for profile '.$profilearray['label'].'" class="center inline-block CTable CTableRow'.($i%2==0?'1':'0').'" style="width: 346px;">'."\n";
+        print '<div summary="Dolibarr online demonstration for profile '.$profilearray['label'].'" class="center inline-block CTable CTableRow'.($i % 2 == 0 ? '1' : '0').'" style="width: 346px;">'."\n";
 
 
-        print '<div id="a1'.$profilearray['key'].'" class="demobox '.(empty($profilearray['url'])?'modulelineshow cursorpointer':'nomodulelines').'">';
+        print '<div id="a1'.$profilearray['key'].'" class="demobox '.(empty($profilearray['url']) ? 'modulelineshow cursorpointer' : 'nomodulelines').'">';
 
-        print '<a href="'.$urlwithmod.'" class="'.(empty($profilearray['url'])?'modulelineshow':'nomodulelines').'">';
+        print '<a href="'.$urlwithmod.'" class="'.(empty($profilearray['url']) ? 'modulelineshow' : 'nomodulelines').'">';
 		print '<div style="padding: 10px;">';
 
 		print '<img class="demothumb" src="'.$profilearray['icon'].'" alt="Demo '.$profilearray['label'].'">';
@@ -370,36 +370,36 @@ 
 
     		print '<div class="csscolumns">';
 
-    		$listofdisabledmodules=explode(',',$profilearray['disablemodules']);
-    		$j=0;
-    		$nbcolsmod=empty($conf->dol_optimize_smallscreen)?4:3;
+    		$listofdisabledmodules = explode(',', $profilearray['disablemodules']);
+    		$j = 0;
+    		$nbcolsmod = empty($conf->dol_optimize_smallscreen) ? 4 : 3;
     		//var_dump($modules);
-    		foreach($orders as $index => $key) // Loop on qualified (enabled) modules
+    		foreach ($orders as $index => $key) // Loop on qualified (enabled) modules
     		{
     			//print $index.' '.$key;
     			$val = $modules[$index];
-    		    $modulekeyname=strtolower($val->name);
+    		    $modulekeyname = strtolower($val->name);
 
-    		    $modulequalified=1;
-                if (! empty($val->always_enabled) || in_array($modulekeyname,$alwayshiddenuncheckedmodules)) $modulequalified=0;
-                if ($val->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2 && ! $conf->global->$const_name) $modulequalified=0;
-                if ($val->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && ! $conf->global->$const_name) $modulequalified=0;
-                if (! $modulequalified) continue;
+    		    $modulequalified = 1;
+                if (!empty($val->always_enabled) || in_array($modulekeyname, $alwayshiddenuncheckedmodules)) $modulequalified = 0;
+                if ($val->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && !$conf->global->$const_name) $modulequalified = 0;
+                if ($val->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && !$conf->global->$const_name) $modulequalified = 0;
+                if (!$modulequalified) continue;
 
-                if (in_array($modulekeyname,$alwayshiddencheckedmodules))
+                if (in_array($modulekeyname, $alwayshiddencheckedmodules))
                 {
                     print "\n".'<!-- Module '.$modulekeyname.' hidden and always checked -->';
                     print '<input type="hidden" name="'.$modulekeyname.'" value="1">';
                 }
                 else
                 {
-                    $modulo=($j % $nbcolsmod);
+                    $modulo = ($j % $nbcolsmod);
         		    //if ($modulo == 0) print '<tr>';
                     print '<!-- id='.$val->numero.' -->';
                     print '<div class="nowrap">';
                     print '<input type="checkbox" class="checkbox" name="'.$modulekeyname.'" value="1"';
-                    if (in_array($modulekeyname,$alwaysuncheckedmodules)) print ' disabled';
-                    if (! in_array($modulekeyname,$alwaysuncheckedmodules)  && (! in_array($modulekeyname,$listofdisabledmodules) || in_array($modulekeyname,$alwayscheckedmodules))) print ' checked';
+                    if (in_array($modulekeyname, $alwaysuncheckedmodules)) print ' disabled';
+                    if (!in_array($modulekeyname, $alwaysuncheckedmodules) && (!in_array($modulekeyname, $listofdisabledmodules) || in_array($modulekeyname, $alwayscheckedmodules))) print ' checked';
                     print '> <div class="inline-block demomaxoveflow">'.$val->getName().'</div><br>';
                     print '</div>';
                     //if ($modulo == ($nbcolsmod - 1)) print '</tr>';
@@ -428,7 +428,7 @@ 
 
 // TODO Replace this with a hook
 // Google Adsense (need Google module)
-if (! empty($conf->google->enabled) && ! empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && ! empty($conf->global->MAIN_GOOGLE_AD_SLOT))
+if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && !empty($conf->global->MAIN_GOOGLE_AD_SLOT))
 {
 	if (empty($conf->dol_use_jmobile))
 	{
@@ -469,7 +469,7 @@ 
 
     top_httphead();
 
-    top_htmlhead($head,$title,0,0,array(),array('public/demo/demo.css'));
+    top_htmlhead($head, $title, 0, 0, array(), array('public/demo/demo.css'));
 
     print '<body class="demobody"><div class="demobackgrounddiv">'."\n";
 }

Braces +53 added lines, -24 removed lines

@@ -43,7 +43,9 @@ 
 
 // Security check
 global $dolibarr_main_demo;
-if (empty($dolibarr_main_demo)) accessforbidden('Parameter dolibarr_main_demo must be defined in conf file with value "default login,default pass" to enable the demo entry page',0,0,1);
+if (empty($dolibarr_main_demo)) {
+	accessforbidden('Parameter dolibarr_main_demo must be defined in conf file with value "default login,default pass" to enable the demo entry page',0,0,1);
+}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $res=$hookmanager->initHooks(array('demo'));
@@ -160,8 +162,7 @@ 
                         if ($objMod->numero > 0)
                         {
                             $j = $objMod->numero;
-                        }
-                        else
+                        } else
                         {
                             $j = 1000 + $i;
                         }
@@ -170,8 +171,12 @@ 
 
                         // We discard modules according to features level (PS: if module is activated we always show it)
                         $const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',get_class($objMod)));
-                        if ($objMod->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2 && empty($conf->global->$const_name)) $modulequalified=0;
-                        if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && empty($conf->global->$const_name)) $modulequalified=0;
+                        if ($objMod->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2 && empty($conf->global->$const_name)) {
+                        	$modulequalified=0;
+                        }
+                        if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && empty($conf->global->$const_name)) {
+                        	$modulequalified=0;
+                        }
 
                         if ($modulequalified)
                         {
@@ -179,14 +184,18 @@ 
                             $filename[$i]= $modName;
                             $orders[$i]  = $objMod->family."_".$j;   // Tri par famille puis numero module
                             //print "x".$modName." ".$orders[$i]."\n<br>";
-       						if (isset($categ[$objMod->special])) $categ[$objMod->special]++;					// Array of all different modules categories
-       			            else $categ[$objMod->special]=1;
+       						if (isset($categ[$objMod->special])) {
+       							$categ[$objMod->special]++;
+       						}
+       						// Array of all different modules categories
+       			            else {
+       			            	$categ[$objMod->special]=1;
+       			            }
                             $dirmod[$i] = $dirroot;
                             $j++;
                             $i++;
                         }
-		            }
-                    catch(Exception $e)
+		            } catch(Exception $e)
                     {
                         dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
                     }
@@ -204,10 +213,12 @@ 
  * Actions
  */
 
-if (GETPOST('action','aZ09') == 'gotodemo')     // Action run when we click on "Start" after selection modules
+if (GETPOST('action','aZ09') == 'gotodemo') {
+	// Action run when we click on "Start" after selection modules
 {
 	//print 'ee'.GETPOST("demochoice");
 	$disablestring='';
+}
 	// If we disable modules using a profile choice
 	if (GETPOST("demochoice"))
 	{
@@ -227,14 +238,18 @@ 
 	    if (empty($_POST[$modulekeyname]) && empty($val->always_enabled) && ! in_array($modulekeyname,$alwayscheckedmodules))
 	    {
 	        $disablestring.=$modulekeyname.',';
-	        if ($modulekeyname=='propale') $disablestring.='propal,';
+	        if ($modulekeyname=='propale') {
+	        	$disablestring.='propal,';
+	        }
 	    }
 	}
 
     // Do redirect to login page
 	if ($disablestring)
 	{
-		if (GETPOST('urlfrom')) $url.=(preg_match('/\?/',$url)?'&amp;':'?').'urlfrom='.urlencode(GETPOST('urlfrom','alpha'));
+		if (GETPOST('urlfrom')) {
+			$url.=(preg_match('/\?/',$url)?'&amp;':'?').'urlfrom='.urlencode(GETPOST('urlfrom','alpha'));
+		}
 		$url.=(preg_match('/\?/',$url)?'&amp;':'?').'disablemodules='.$disablestring;
         //var_dump($url);exit;
 		header("Location: ".$url);
@@ -305,7 +320,9 @@ 
 	if ($profilearray['default'] >= 0)
 	{
 	    //print $profilearray['lang'];
-	    if (! empty($profilearray['lang'])) $langs->load($profilearray['lang']);
+	    if (! empty($profilearray['lang'])) {
+	    	$langs->load($profilearray['lang']);
+	    }
 
 		$url=$_SERVER["PHP_SELF"].'?action=gotodemo';
 		$urlwithmod=$url.'&amp;demochoice='.$profilearray['key'];
@@ -374,32 +391,45 @@ 
     		$j=0;
     		$nbcolsmod=empty($conf->dol_optimize_smallscreen)?4:3;
     		//var_dump($modules);
-    		foreach($orders as $index => $key) // Loop on qualified (enabled) modules
+    		foreach($orders as $index => $key) {
+    			// Loop on qualified (enabled) modules
     		{
     			//print $index.' '.$key;
     			$val = $modules[$index];
+    		}
     		    $modulekeyname=strtolower($val->name);
 
     		    $modulequalified=1;
-                if (! empty($val->always_enabled) || in_array($modulekeyname,$alwayshiddenuncheckedmodules)) $modulequalified=0;
-                if ($val->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2 && ! $conf->global->$const_name) $modulequalified=0;
-                if ($val->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && ! $conf->global->$const_name) $modulequalified=0;
-                if (! $modulequalified) continue;
+                if (! empty($val->always_enabled) || in_array($modulekeyname,$alwayshiddenuncheckedmodules)) {
+                	$modulequalified=0;
+                }
+                if ($val->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2 && ! $conf->global->$const_name) {
+                	$modulequalified=0;
+                }
+                if ($val->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && ! $conf->global->$const_name) {
+                	$modulequalified=0;
+                }
+                if (! $modulequalified) {
+                	continue;
+                }
 
                 if (in_array($modulekeyname,$alwayshiddencheckedmodules))
                 {
                     print "\n".'<!-- Module '.$modulekeyname.' hidden and always checked -->';
                     print '<input type="hidden" name="'.$modulekeyname.'" value="1">';
-                }
-                else
+                } else
                 {
                     $modulo=($j % $nbcolsmod);
         		    //if ($modulo == 0) print '<tr>';
                     print '<!-- id='.$val->numero.' -->';
                     print '<div class="nowrap">';
                     print '<input type="checkbox" class="checkbox" name="'.$modulekeyname.'" value="1"';
-                    if (in_array($modulekeyname,$alwaysuncheckedmodules)) print ' disabled';
-                    if (! in_array($modulekeyname,$alwaysuncheckedmodules)  && (! in_array($modulekeyname,$listofdisabledmodules) || in_array($modulekeyname,$alwayscheckedmodules))) print ' checked';
+                    if (in_array($modulekeyname,$alwaysuncheckedmodules)) {
+                    	print ' disabled';
+                    }
+                    if (! in_array($modulekeyname,$alwaysuncheckedmodules)  && (! in_array($modulekeyname,$listofdisabledmodules) || in_array($modulekeyname,$alwayscheckedmodules))) {
+                    	print ' checked';
+                    }
                     print '> <div class="inline-block demomaxoveflow">'.$val->getName().'</div><br>';
                     print '</div>';
                     //if ($modulo == ($nbcolsmod - 1)) print '</tr>';
@@ -444,8 +474,7 @@ 
 		print 'src="http://pagead2.googlesyndication.com/pagead/show_ads.js">'."\n";
 		print '</script>'."\n";
 		print '</div>'."\n";
-	}
-	else
+	} else
 	{
 		print '<!-- google js advert tag disabled with jmobile -->'."\n";
 	}

htdocs/public/opensurvey/studs.php

Indentation +5 added lines, -5 removed lines

@@ -245,13 +245,13 @@
 
 if (empty($object->ref))     // For survey, id is a hex string
 {
-    $langs->load("errors");
-    print $langs->trans("ErrorRecordNotFound");
+	$langs->load("errors");
+	print $langs->trans("ErrorRecordNotFound");
 
-    llxFooterSurvey();
+	llxFooterSurvey();
 
-    $db->close();
-    exit();
+	$db->close();
+	exit();
 }
 
 // Define format of choices

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>';

Braces +162 added lines, -76 removed lines

@@ -48,7 +48,9 @@ 
 $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);
+}
 
 
 /*
@@ -62,7 +64,9 @@ 
 // Add comment
 if (GETPOST('ajoutcomment'))
 {
-	if (!$canbemodified) accessforbidden();
+	if (!$canbemodified) {
+		accessforbidden();
+	}
 
 	$error=0;
 
@@ -84,14 +88,18 @@ 
 
 		$resql = $object->addComment($comment, $comment_user);
 
-		if (! $resql) dol_print_error($db);
+		if (! $resql) {
+			dol_print_error($db);
+		}
 	}
 }
 
 // Add vote
-if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x"))		// boutonp for chrom, boutonp_x for firefox
+if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x")) {
+	// boutonp for chrom, boutonp_x for firefox
 {
 	if (!$canbemodified) accessforbidden();
+}
 
 	//Si le nom est bien entré
 	if (GETPOST('nom'))
@@ -102,12 +110,10 @@ 
 			if (isset($_POST["choix$i"]) && $_POST["choix$i"] == '1')
 			{
 				$nouveauchoix.="1";
-			}
-			else if (isset($_POST["choix$i"]) && $_POST["choix$i"] == '2')
+			} else if (isset($_POST["choix$i"]) && $_POST["choix$i"] == '2')
 			{
 				$nouveauchoix.="2";
-			}
-			else { // sinon c'est 0
+			} else { // sinon c'est 0
 				$nouveauchoix.="0";
 			}
 		}
@@ -119,15 +125,16 @@ 
 		$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)
 		{
 			setEventMessages($langs->trans("VoteNameAlreadyExists"), null, 'errors');
 			$error++;
-		}
-		else
+		} 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)."')";
@@ -160,11 +167,11 @@ 
 						$result=$cmailfile->sendfile();
 					}
 				}
+			} else {
+				dol_print_error($db);
 			}
-			else dol_print_error($db);
 		}
-	}
-	else
+	} else
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Name")), null, 'errors');
 	}
@@ -201,17 +208,17 @@ 
 		if (isset($_POST["choix".$i]) && $_POST["choix".$i] == '1')
 		{
 			$nouveauchoix.="1";
-		}
-		else if (isset($_POST["choix".$i]) && $_POST["choix".$i] == '2')
+		} else if (isset($_POST["choix".$i]) && $_POST["choix".$i] == '2')
 		{
 			$nouveauchoix.="2";
-		}
-		else { // sinon c'est 0
+		} else { // sinon c'est 0
 			$nouveauchoix.="0";
 		}
 	}
 
-	if (!$canbemodified) accessforbidden();
+	if (!$canbemodified) {
+		accessforbidden();
+	}
 
 	$idtomodify=$_POST["idtomodify".$modifier];
 	$sql = 'UPDATE '.MAIN_DB_PREFIX."opensurvey_user_studs";
@@ -219,14 +226,18 @@ 
 	$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');
 if ($idcomment)
 {
-	if (!$canbemodified) accessforbidden();
+	if (!$canbemodified) {
+		accessforbidden();
+	}
 
 	$resql = $object->deleteComment($idcomment);
 }
@@ -243,9 +254,11 @@ 
 $arrayofcss=array('/opensurvey/css/style.css');
 llxHeaderSurvey($object->titre, "", 0, 0, $arrayofjs, $arrayofcss);
 
-if (empty($object->ref))     // For survey, id is a hex string
+if (empty($object->ref)) {
+	// For survey, id is a hex string
 {
     $langs->load("errors");
+}
     print $langs->trans("ErrorRecordNotFound");
 
     llxFooterSurvey();
@@ -384,8 +397,7 @@ 
 
 		print '</tr>'."\n";
 	}
-}
-else
+} else
 {
 	//display of survey topics
 	print '<tr>'."\n";
@@ -444,37 +456,67 @@ 
 
 			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";
+				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 (((string) $car) == "1") $sumfor[$i]++;
+				if (! isset($sumfor[$i])) {
+					$sumfor[$i] = 0;
+				}
+				if (((string) $car) == "1") {
+					$sumfor[$i]++;
+				}
 			}
 			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";
+				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 (((string) $car) == "1") $sumfor[$i]++;
-				if (((string) $car) == "0") $sumagainst[$i]++;
+				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 (((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";
+				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 (((string) $car) == "1") $sumfor[$i]++;
-				if (((string) $car) == "0") $sumagainst[$i]++;
+				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]++;
+				}
 			}
 		}
-	}
-	else
+	} else
 	{
 		//sinon on remplace les choix de l'utilisateur par une ligne de checkbox pour recuperer de nouvelles valeurs
 		if ($compteur == $ligneamodifier)
@@ -486,7 +528,9 @@ 
 				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';
+					if ($car == '1') {
+						print 'checked';
+					}
 					print '>';
 				}
 				if (! empty($listofanswers[$i]['format']) && $listofanswers[$i]['format'] == 'yesno')
@@ -501,41 +545,71 @@ 
 				}
 				print '</td>'."\n";
 			}
-		}
-		else
+		} else
 		{
 			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 (((string) $car) == "1") print '<td class="ok">OK</td>'."\n";
-					else print '<td class="non">KO</td>'."\n";
+					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 (((string) $car) == "1") $sumfor[$i]++;
+					if (! isset($sumfor[$i])) {
+						$sumfor[$i] = 0;
+					}
+					if (((string) $car) == "1") {
+						$sumfor[$i]++;
+					}
 				}
 				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";
+					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 (((string) $car) == "1") $sumfor[$i]++;
-					if (((string) $car) == "0") $sumagainst[$i]++;
+					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 (((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";
+					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 (((string) $car) == "1") $sumfor[$i]++;
-					if (((string) $car) == "0") $sumagainst[$i]++;
+					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]++;
+					}
 				}
 			}
 		}
@@ -614,8 +688,9 @@ 
 $nbofcheckbox=0;
 for ($i=0; $i < $nbcolonnes; $i++)
 {
-	if (empty($listofanswers[$i]['format']) || ! in_array($listofanswers[$i]['format'],array('yesno','foragainst')))
-	$nbofcheckbox++;
+	if (empty($listofanswers[$i]['format']) || ! in_array($listofanswers[$i]['format'],array('yesno','foragainst'))) {
+		$nbofcheckbox++;
+	}
 	if (isset($sumfor[$i]))
 	{
 		if ($i == 0)
@@ -637,13 +712,23 @@ 
 	{
 		$showsumfor = isset($sumfor[$i])?$sumfor[$i]:'';
 		$showsumagainst = isset($sumagainst[$i])?$sumagainst[$i]:'';
-		if (empty($showsumfor)) $showsumfor = 0;
-		if (empty($showsumagainst)) $showsumagainst = 0;
+		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>';
@@ -687,8 +772,7 @@ 
 				} else {
 					$meilleursujet .= dol_print_date($toutsujet[$i],'daytext'). ' ('.dol_print_date($toutsujet[$i],'%A').')';
 				}
-			}
-			else
+			} else
 			{
 				$tmps=explode('@',$toutsujet[$i]);
 				$meilleursujet .= dol_htmlentities($tmps[0]);
@@ -730,7 +814,9 @@ 
 
 	foreach ($comments as $obj) {
 		print '<div class="comment"><span class="usercomment">';
-		if (in_array($obj->usercomment, $listofvoters)) print '<a href="'.$_SERVER["PHP_SELF"].'?deletecomment='.$obj->id_comment.'&sondage='.$numsondage.'"> '.img_picto('', 'delete.png').'</a> ';
+		if (in_array($obj->usercomment, $listofvoters)) {
+			print '<a href="'.$_SERVER["PHP_SELF"].'?deletecomment='.$obj->id_comment.'&sondage='.$numsondage.'"> '.img_picto('', 'delete.png').'</a> ';
+		}
 		print dol_htmlentities($obj->usercomment).':</span> <span class="comment">'.dol_nl2br(dol_htmlentities($obj->comment))."</span></div>";
 	}
 }

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_arrays.php

Indentation +15 added lines, -15 removed lines

@@ -55,9 +55,9 @@ 
 }
 else
 {
-    $arraycss=array();
-    $arrayjs=array();
-    /*
+	$arraycss=array();
+	$arrayjs=array();
+	/*
 	$arraycss=array('/includes/jquery/plugins/datatables/media/css/jquery.dataTables.css',
 			'/includes/jquery/plugins/datatables/extensions/Buttons/css/buttons.dataTables.min.css',
 			'/includes/jquery/plugins/datatables/extensions/ColReorder/css/colReorder.dataTables.min.css'
@@ -214,12 +214,12 @@ 
 
 if (! empty($moreforfilter))
 {
-    print '<div class="liste_titre liste_titre_bydiv centpercent">';
-    print $moreforfilter;
-    $parameters=array();
-    $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-    print '</div>';
+	print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	print $moreforfilter;
+	$parameters=array();
+	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	print '</div>';
 }
 
 ?>
@@ -252,12 +252,12 @@ 
 $(document).ready(function(){
     $('#idtableexample2').dataTable( {
     	<?php
-    	if ($optioncss=='print') {
-    	 	print '\'dom\': \'lfrtip\',';
-    	} else {
-    		print '\'dom\': \'Blfrtip\',';
-    	}
-    	?>
+		if ($optioncss=='print') {
+		 	print '\'dom\': \'lfrtip\',';
+		} else {
+			print '\'dom\': \'Blfrtip\',';
+		}
+		?>
     	"colReorder": true,
 		'buttons': [
 		          'colvis','copy', 'csv', 'excel', 'pdf', 'print'

Braces +35 added lines, -14 removed lines

@@ -52,8 +52,7 @@ 
 
 
 	<?php
-}
-else
+} else
 {
     $arraycss=array();
     $arrayjs=array();
@@ -167,19 +166,39 @@ 
 $sortorder='ASC';
 $tasksarray=array(1,2,3);	// To force having several lines
 $tagidfortablednd='tablelines3';
-if (! empty($conf->use_javascript_ajax)) include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
+if (! empty($conf->use_javascript_ajax)) {
+	include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
+}
 
 $nav='';
 $nav.='<form name="dateselect" action="'.$_SERVER["PHP_SELF"].'?action=show_peruser'.$param.'">';
-if ($actioncode || isset($_GET['actioncode']) || isset($_POST['actioncode'])) $nav.='<input type="hidden" name="actioncode" value="'.$actioncode.'">';
-if ($status || isset($_GET['status']) || isset($_POST['status']))  $nav.='<input type="hidden" name="status" value="'.$status.'">';
-if ($filter)  $nav.='<input type="hidden" name="filter" value="'.$filter.'">';
-if ($filtert) $nav.='<input type="hidden" name="filtert" value="'.$filtert.'">';
-if ($socid)   $nav.='<input type="hidden" name="socid" value="'.$socid.'">';
-if ($showbirthday)  $nav.='<input type="hidden" name="showbirthday" value="1">';
-if ($pid)    $nav.='<input type="hidden" name="projectid" value="'.$pid.'">';
-if ($type)   $nav.='<input type="hidden" name="type" value="'.$type.'">';
-if ($usergroup) $nav.='<input type="hidden" name="usergroup" value="'.$usergroup.'">';
+if ($actioncode || isset($_GET['actioncode']) || isset($_POST['actioncode'])) {
+	$nav.='<input type="hidden" name="actioncode" value="'.$actioncode.'">';
+}
+if ($status || isset($_GET['status']) || isset($_POST['status'])) {
+	$nav.='<input type="hidden" name="status" value="'.$status.'">';
+}
+if ($filter) {
+	$nav.='<input type="hidden" name="filter" value="'.$filter.'">';
+}
+if ($filtert) {
+	$nav.='<input type="hidden" name="filtert" value="'.$filtert.'">';
+}
+if ($socid) {
+	$nav.='<input type="hidden" name="socid" value="'.$socid.'">';
+}
+if ($showbirthday) {
+	$nav.='<input type="hidden" name="showbirthday" value="1">';
+}
+if ($pid) {
+	$nav.='<input type="hidden" name="projectid" value="'.$pid.'">';
+}
+if ($type) {
+	$nav.='<input type="hidden" name="type" value="'.$type.'">';
+}
+if ($usergroup) {
+	$nav.='<input type="hidden" name="usergroup" value="'.$usergroup.'">';
+}
 $nav.=$form->select_date($dateselect, 'dateselect', 0, 0, 1, '', 1, 0, 1);
 $nav.=' <input type="submit" name="submitdateselect" class="button" value="'.$langs->trans("Refresh").'">';
 $nav.='</form>';
@@ -301,8 +320,10 @@ 
 <?php
 	$tasksarray=array(1,2,3);	// To force having several lines
 	$tagidfortablednd='tablelines';
-	if (! empty($conf->use_javascript_ajax)) include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
-?>
+	if (! empty($conf->use_javascript_ajax)) {
+		include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
+	}
+	?>
 <div class="tagtable centpercent liste_titre_bydiv" id="tablelines">
     <div class="tagtr liste_titre">
         <div class="tagtd">Title A<input type="hidden" name="cartitem" value="3"></div>

Spacing +62 added lines, -62 removed lines

@@ -1,6 +1,6 @@ 
 <?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("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
 
 require '../../main.inc.php';
 
@@ -8,9 +8,9 @@ 
 	accessforbidden();
 }
 
-$usedolheader=1;	// 1 = Test inside a dolibarr page, 0 = Use hard coded header
+$usedolheader = 1; // 1 = Test inside a dolibarr page, 0 = Use hard coded header
 
-$form=new Form($db);
+$form = new Form($db);
 
 
 
@@ -32,7 +32,7 @@ 
 	<!-- Includes for JQuery (Ajax library) -->
 	<link rel="stylesheet" type="text/css" href="<?php echo DOL_URL_ROOT ?>/includes/jquery/css/smoothness/jquery-ui.css" />
 	<!-- <link rel="stylesheet" type="text/css" href="<?php echo DOL_URL_ROOT ?>/includes/jquery/plugins/datatables/media/css/jquery.dataTables.css" /> -->
-	<link rel="stylesheet" type="text/css" title="default" href="<?php echo DOL_URL_ROOT ?>/theme/eldy/style.css.php<?php echo ($_GET["dol_use_jmobile"] == 1)?'?dol_use_jmobile=1&dol_optimize_smallscreen=1':''; ?>" />
+	<link rel="stylesheet" type="text/css" title="default" href="<?php echo DOL_URL_ROOT ?>/theme/eldy/style.css.php<?php echo ($_GET["dol_use_jmobile"] == 1) ? '?dol_use_jmobile=1&dol_optimize_smallscreen=1' : ''; ?>" />
 	<!-- Includes JS for JQuery -->
 	<script type="text/javascript" src="<?php echo DOL_URL_ROOT ?>/includes/jquery/js/jquery.min.js"></script>
 	<!-- migration fixes for removed Jquery functions -->
@@ -49,8 +49,8 @@ 
 }
 else
 {
-    $arraycss=array();
-    $arrayjs=array();
+    $arraycss = array();
+    $arrayjs = array();
     /*
 	$arraycss=array('/includes/jquery/plugins/datatables/media/css/jquery.dataTables.css',
 			'/includes/jquery/plugins/datatables/extensions/Buttons/css/buttons.dataTables.min.css',
@@ -69,7 +69,7 @@ 
 	);
     */
 
-	llxHeader('','','','',0,0,$arrayjs,$arraycss);
+	llxHeader('', '', '', '', 0, 0, $arrayjs, $arraycss);
 }
 
 
@@ -154,76 +154,76 @@ 
 
 <?php
 include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-$productspecimen=new Product($db);
+$productspecimen = new Product($db);
 $productspecimen->initAsSpecimen();
 
-$sortfield='aaa';
-$sortorder='ASC';
-$tasksarray=array(1,2,3);	// To force having several lines
-$tagidfortablednd='tablelines3';
-if (! empty($conf->use_javascript_ajax)) include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
-
-$nav='';
-$nav.='<form name="dateselect" action="'.$_SERVER["PHP_SELF"].'?action=show_peruser'.$param.'">';
-if ($actioncode || isset($_GET['actioncode']) || isset($_POST['actioncode'])) $nav.='<input type="hidden" name="actioncode" value="'.$actioncode.'">';
-if ($status || isset($_GET['status']) || isset($_POST['status']))  $nav.='<input type="hidden" name="status" value="'.$status.'">';
-if ($filter)  $nav.='<input type="hidden" name="filter" value="'.$filter.'">';
-if ($filtert) $nav.='<input type="hidden" name="filtert" value="'.$filtert.'">';
-if ($socid)   $nav.='<input type="hidden" name="socid" value="'.$socid.'">';
-if ($showbirthday)  $nav.='<input type="hidden" name="showbirthday" value="1">';
-if ($pid)    $nav.='<input type="hidden" name="projectid" value="'.$pid.'">';
-if ($type)   $nav.='<input type="hidden" name="type" value="'.$type.'">';
-if ($usergroup) $nav.='<input type="hidden" name="usergroup" value="'.$usergroup.'">';
-$nav.=$form->select_date($dateselect, 'dateselect', 0, 0, 1, '', 1, 0, 1);
-$nav.=' <input type="submit" name="submitdateselect" class="button" value="'.$langs->trans("Refresh").'">';
-$nav.='</form>';
-
-$limit=10;
+$sortfield = 'aaa';
+$sortorder = 'ASC';
+$tasksarray = array(1, 2, 3); // To force having several lines
+$tagidfortablednd = 'tablelines3';
+if (!empty($conf->use_javascript_ajax)) include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
+
+$nav = '';
+$nav .= '<form name="dateselect" action="'.$_SERVER["PHP_SELF"].'?action=show_peruser'.$param.'">';
+if ($actioncode || isset($_GET['actioncode']) || isset($_POST['actioncode'])) $nav .= '<input type="hidden" name="actioncode" value="'.$actioncode.'">';
+if ($status || isset($_GET['status']) || isset($_POST['status']))  $nav .= '<input type="hidden" name="status" value="'.$status.'">';
+if ($filter)  $nav .= '<input type="hidden" name="filter" value="'.$filter.'">';
+if ($filtert) $nav .= '<input type="hidden" name="filtert" value="'.$filtert.'">';
+if ($socid)   $nav .= '<input type="hidden" name="socid" value="'.$socid.'">';
+if ($showbirthday)  $nav .= '<input type="hidden" name="showbirthday" value="1">';
+if ($pid)    $nav .= '<input type="hidden" name="projectid" value="'.$pid.'">';
+if ($type)   $nav .= '<input type="hidden" name="type" value="'.$type.'">';
+if ($usergroup) $nav .= '<input type="hidden" name="usergroup" value="'.$usergroup.'">';
+$nav .= $form->select_date($dateselect, 'dateselect', 0, 0, 1, '', 1, 0, 1);
+$nav .= ' <input type="submit" name="submitdateselect" class="button" value="'.$langs->trans("Refresh").'">';
+$nav .= '</form>';
+
+$limit = 10;
 print_barre_liste('Title of my list', 12, $_SERVER["PHP_SELF"], '', '', '', 'Text in middle', 20, 500, '', 0, $nav, '', $limit);
 
 
-$moreforfilter.='<div class="divsearchfield">';
-$moreforfilter.=$langs->trans('This is a select list for a filter A'). ': ';
-$cate_arbo = array('field1'=>'value1a into the select list A','field2'=>'value2a');
-$moreforfilter.=$form->selectarray('search_aaa', $cate_arbo, '', 1);		// List without js combo
-$moreforfilter.='</div>';
+$moreforfilter .= '<div class="divsearchfield">';
+$moreforfilter .= $langs->trans('This is a select list for a filter A').': ';
+$cate_arbo = array('field1'=>'value1a into the select list A', 'field2'=>'value2a');
+$moreforfilter .= $form->selectarray('search_aaa', $cate_arbo, '', 1); // List without js combo
+$moreforfilter .= '</div>';
 
-$moreforfilter.='<div class="divsearchfield">';
-$moreforfilter.=$langs->trans('This is a select list for a filter B'). ': ';
-$cate_arbo = array('field1'=>'value1b into the select list B','field2'=>'value2b');
-$moreforfilter.=$form->selectarray('search_bbb', $cate_arbo, '', 1, 0, 0, '', 0, 0, 0, 0, '', 1);		// List with js combo
-$moreforfilter.='</div>';
+$moreforfilter .= '<div class="divsearchfield">';
+$moreforfilter .= $langs->trans('This is a select list for a filter B').': ';
+$cate_arbo = array('field1'=>'value1b into the select list B', 'field2'=>'value2b');
+$moreforfilter .= $form->selectarray('search_bbb', $cate_arbo, '', 1, 0, 0, '', 0, 0, 0, 0, '', 1); // List with js combo
+$moreforfilter .= '</div>';
 
-$moreforfilter.='<div class="divsearchfield">';
-$moreforfilter.=$langs->trans('This is a select list for a filter C'). ': ';
-$cate_arbo = array('field1'=>'value1c into the select list C','field2'=>'value2c');
-$moreforfilter.=$form->selectarray('search_ccc', $cate_arbo, '', 1, 0, 0, '', 0, 0, 0, 0, '', 1);		// List with js combo
-$moreforfilter.='</div>';
+$moreforfilter .= '<div class="divsearchfield">';
+$moreforfilter .= $langs->trans('This is a select list for a filter C').': ';
+$cate_arbo = array('field1'=>'value1c into the select list C', 'field2'=>'value2c');
+$moreforfilter .= $form->selectarray('search_ccc', $cate_arbo, '', 1, 0, 0, '', 0, 0, 0, 0, '', 1); // List with js combo
+$moreforfilter .= '</div>';
 
-$moreforfilter.='<div class="divsearchfield">';
-$moreforfilter.=$langs->trans('This is a select list for a filter D'). ': ';
-$cate_arbo = array('field1'=>'value1d into the select list D','field2'=>'value2d');
-$moreforfilter.=$form->selectarray('search_ddd', $cate_arbo, '', 1, 0, 0, '', 0, 0, 0, 0, '', 1);		// List with js combo
-$moreforfilter.='</div>';
+$moreforfilter .= '<div class="divsearchfield">';
+$moreforfilter .= $langs->trans('This is a select list for a filter D').': ';
+$cate_arbo = array('field1'=>'value1d into the select list D', 'field2'=>'value2d');
+$moreforfilter .= $form->selectarray('search_ddd', $cate_arbo, '', 1, 0, 0, '', 0, 0, 0, 0, '', 1); // List with js combo
+$moreforfilter .= '</div>';
 
-if (! empty($moreforfilter))
+if (!empty($moreforfilter))
 {
     print '<div class="liste_titre liste_titre_bydiv centpercent">';
     print $moreforfilter;
-    $parameters=array();
-    $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+    $parameters = array();
+    $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
     print $hookmanager->resPrint;
     print '</div>';
 }
 
 ?>
 
-<table class="stripe row-border order-column centpercent tagtable liste<?php echo $moreforfilter?" listwithfilterbefore":""; ?>" id="tablelines3">
+<table class="stripe row-border order-column centpercent tagtable liste<?php echo $moreforfilter ? " listwithfilterbefore" : ""; ?>" id="tablelines3">
 <thead>
 <tr class="liste_titre">
-<?php print getTitleFieldOfList($langs->trans('title1'),0,$_SERVER["PHP_SELF"],'aaa','','','align="left"',$sortfield,$sortorder); ?>
-<?php print getTitleFieldOfList($langs->trans('title2'),0,$_SERVER["PHP_SELF"],'bbb','','','align="right"',$sortfield,$sortorder); ?>
-<?php print getTitleFieldOfList($langs->trans('title3'),0,$_SERVER["PHP_SELF"],'ccc','','','align="center"',$sortfield,$sortorder); ?>
+<?php print getTitleFieldOfList($langs->trans('title1'), 0, $_SERVER["PHP_SELF"], 'aaa', '', '', 'align="left"', $sortfield, $sortorder); ?>
+<?php print getTitleFieldOfList($langs->trans('title2'), 0, $_SERVER["PHP_SELF"], 'bbb', '', '', 'align="right"', $sortfield, $sortorder); ?>
+<?php print getTitleFieldOfList($langs->trans('title3'), 0, $_SERVER["PHP_SELF"], 'ccc', '', '', 'align="center"', $sortfield, $sortorder); ?>
 </tr>
 </thead>
 <tbody>
@@ -246,7 +246,7 @@ 
 $(document).ready(function(){
     $('#idtableexample2').dataTable( {
     	<?php
-    	if ($optioncss=='print') {
+    	if ($optioncss == 'print') {
     	 	print '\'dom\': \'lfrtip\',';
     	} else {
     		print '\'dom\': \'Blfrtip\',';
@@ -293,9 +293,9 @@ 
 
 
 <?php
-	$tasksarray=array(1,2,3);	// To force having several lines
-	$tagidfortablednd='tablelines';
-	if (! empty($conf->use_javascript_ajax)) include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
+	$tasksarray = array(1, 2, 3); // To force having several lines
+	$tagidfortablednd = 'tablelines';
+	if (!empty($conf->use_javascript_ajax)) include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
 ?>
 <div class="tagtable centpercent liste_titre_bydiv" id="tablelines">
     <div class="tagtr liste_titre">
@@ -341,7 +341,7 @@ 
 
 
 <?php
-if (! empty($usedolheader))
+if (!empty($usedolheader))
 {
 	llxFooter();
 } else { ?>

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;

Braces +43 added lines, -12 removed lines

@@ -1,22 +1,53 @@
 <?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');
 

htdocs/public/notice.php

Indentation +6 added lines, -6 removed lines

@@ -36,15 +36,15 @@
 
 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>';
+	print 'Sorry, it seems your internet connexion is off.<br>';
+	print 'You need to be connected to network to use this software.<br>';
 }
 else
 {
-    $langs->load("error");
-    $langs->load("other");
+	$langs->load("error");
+	$langs->load("other");
     
-    if (GETPOST('transphrase')) print GETPOST('transphrase'); 
-    if (GETPOST('transkey')) print $langs->trans(GETPOST('transkey'));
+	if (GETPOST('transphrase')) print GETPOST('transphrase'); 
+	if (GETPOST('transkey')) print $langs->trans(GETPOST('transkey'));
 }
 

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>';

Braces +8 added lines, -5 removed lines

@@ -38,13 +38,16 @@
 {
     print 'Sorry, it seems your internet connexion is off.<br>';
     print 'You need to be connected to network to use this software.<br>';
-}
-else
+} else
 {
     $langs->load("error");
     $langs->load("other");
     
-    if (GETPOST('transphrase')) print GETPOST('transphrase'); 
-    if (GETPOST('transkey')) print $langs->trans(GETPOST('transkey'));
-}
+    if (GETPOST('transphrase')) {
+    	print GETPOST('transphrase');
+    }
+    if (GETPOST('transkey')) {
+    	print $langs->trans(GETPOST('transkey'));
+    }
+    }