Dolibarr / dolibarr

htdocs/public/agenda/agendaexport.php

Indentation +7 added lines, -7 removed lines

@@ -108,12 +108,12 @@ 
 // Complete long filename
 foreach ($filters as $key => $value)
 {
-    //if ($key == 'notolderthan')    $filename.='-notolderthan'.$value; This filter key is already added before and does not need to be in filename
+	//if ($key == 'notolderthan')    $filename.='-notolderthan'.$value; This filter key is already added before and does not need to be in filename
 	if ($key == 'year')            $filename.='-year'.$value;
-    if ($key == 'id')              $filename.='-id'.$value;
-    if ($key == 'idfrom')          $filename.='-idfrom'.$value;
-    if ($key == 'idto')            $filename.='-idto'.$value;
-    if ($key == 'project')         $filename.='-project'.$value;
+	if ($key == 'id')              $filename.='-id'.$value;
+	if ($key == 'idfrom')          $filename.='-idfrom'.$value;
+	if ($key == 'idto')            $filename.='-idto'.$value;
+	if ($key == 'project')         $filename.='-project'.$value;
 	if ($key == 'logina')	       $filename.='-logina'.$value;	// Author
 	if ($key == 'logint')	       $filename.='-logint'.$value;	// Assigned to
 }
@@ -127,7 +127,7 @@ 
 	$langs->load("main");
 	$langs->load("errors");
 	llxHeaderVierge();
-    print '<div class="error">'.$langs->trans("ErrorWrongValueForParameterX",'format').'</div>';
+	print '<div class="error">'.$langs->trans("ErrorWrongValueForParameterX",'format').'</div>';
 	llxFooterVierge();
 	exit;
 }
@@ -162,7 +162,7 @@ 
 		$result=readfile($outputfile);
 		if (! $result) print 'File '.$outputfile.' was empty.';
 
-	    //header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
+		//header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
 		exit;
 	}
 	else

Braces +121 added lines, -43 removed lines

@@ -32,10 +32,20 @@ 
 //if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
 //if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
 //if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
+if (! defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL','1');
+}
+if (! defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU','1');
+}
+// If there is no menu to show
+if (! defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML','1');
+}
+// If we don't need to load the html.form.class.php
+if (! defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX','1');
+}
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
 define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
 
@@ -57,27 +67,53 @@ 
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
 // Security check
-if (empty($conf->agenda->enabled)) accessforbidden('',0,0,1);
+if (empty($conf->agenda->enabled)) {
+	accessforbidden('',0,0,1);
+}
 
 // Not older than
-if (! isset($conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY)) $conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY=100;	// default limit
+if (! isset($conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY)) {
+	$conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY=100;
+}
+// default limit
 
 // Define format, type and filter
 $format='ical';
 $type='event';
-if (GETPOST("format",'alpha')) $format=GETPOST("format",'apha');
-if (GETPOST("type",'apha'))   $type=GETPOST("type",'alpha');
+if (GETPOST("format",'alpha')) {
+	$format=GETPOST("format",'apha');
+}
+if (GETPOST("type",'apha')) {
+	$type=GETPOST("type",'alpha');
+}
 
 $filters=array();
-if (GETPOST("year",'int')) 	        $filters['year']=GETPOST("year",'int');
-if (GETPOST("id",'int'))            $filters['id']=GETPOST("id",'int');
-if (GETPOST("idfrom",'int'))        $filters['idfrom']=GETPOST("idfrom",'int');
-if (GETPOST("idto",'int'))          $filters['idto']=GETPOST("idto",'int');
-if (GETPOST("project",'apha'))      $filters['project']=GETPOST("project",'apha');
-if (GETPOST("logina",'apha'))       $filters['logina']=GETPOST("logina",'apha');
-if (GETPOST("logint",'apha'))       $filters['logint']=GETPOST("logint",'apha');
-if (GETPOST("notolderthan",'int'))  $filters['notolderthan']=GETPOST("notolderthan","int");
-else $filters['notolderthan']=$conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY;
+if (GETPOST("year",'int')) {
+	$filters['year']=GETPOST("year",'int');
+}
+if (GETPOST("id",'int')) {
+	$filters['id']=GETPOST("id",'int');
+}
+if (GETPOST("idfrom",'int')) {
+	$filters['idfrom']=GETPOST("idfrom",'int');
+}
+if (GETPOST("idto",'int')) {
+	$filters['idto']=GETPOST("idto",'int');
+}
+if (GETPOST("project",'apha')) {
+	$filters['project']=GETPOST("project",'apha');
+}
+if (GETPOST("logina",'apha')) {
+	$filters['logina']=GETPOST("logina",'apha');
+}
+if (GETPOST("logint",'apha')) {
+	$filters['logint']=GETPOST("logint",'apha');
+}
+if (GETPOST("notolderthan",'int')) {
+	$filters['notolderthan']=GETPOST("notolderthan","int");
+} else {
+	$filters['notolderthan']=$conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY;
+}
 
 // Check config
 if (empty($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY))
@@ -109,13 +145,29 @@ 
 foreach ($filters as $key => $value)
 {
     //if ($key == 'notolderthan')    $filename.='-notolderthan'.$value; This filter key is already added before and does not need to be in filename
-	if ($key == 'year')            $filename.='-year'.$value;
-    if ($key == 'id')              $filename.='-id'.$value;
-    if ($key == 'idfrom')          $filename.='-idfrom'.$value;
-    if ($key == 'idto')            $filename.='-idto'.$value;
-    if ($key == 'project')         $filename.='-project'.$value;
-	if ($key == 'logina')	       $filename.='-logina'.$value;	// Author
-	if ($key == 'logint')	       $filename.='-logint'.$value;	// Assigned to
+	if ($key == 'year') {
+		$filename.='-year'.$value;
+	}
+    if ($key == 'id') {
+    	$filename.='-id'.$value;
+    }
+    if ($key == 'idfrom') {
+    	$filename.='-idfrom'.$value;
+    }
+    if ($key == 'idto') {
+    	$filename.='-idto'.$value;
+    }
+    if ($key == 'project') {
+    	$filename.='-project'.$value;
+    }
+	if ($key == 'logina') {
+		$filename.='-logina'.$value;
+	}
+	// Author
+	if ($key == 'logint') {
+		$filename.='-logint'.$value;
+	}
+	// Assigned to
 }
 // Add extension
 if ($format == 'vcal') { $shortfilename.='.vcs'; $filename.='.vcs'; }
@@ -135,7 +187,9 @@ 
 $agenda=new ActionComm($db);
 
 $cachedelay=0;
-if (! empty($conf->global->MAIN_AGENDA_EXPORT_CACHE)) $cachedelay=$conf->global->MAIN_AGENDA_EXPORT_CACHE;
+if (! empty($conf->global->MAIN_AGENDA_EXPORT_CACHE)) {
+	$cachedelay=$conf->global->MAIN_AGENDA_EXPORT_CACHE;
+}
 
 // Build file
 if ($format == 'ical' || $format == 'vcal')
@@ -144,28 +198,40 @@ 
 	if ($result >= 0)
 	{
 		$attachment = true;
-		if (isset($_GET["attachment"])) $attachment=$_GET["attachment"];
+		if (isset($_GET["attachment"])) {
+			$attachment=$_GET["attachment"];
+		}
 		//$attachment = false;
 		$contenttype='text/calendar';
-		if (isset($_GET["contenttype"])) $contenttype=$_GET["contenttype"];
+		if (isset($_GET["contenttype"])) {
+			$contenttype=$_GET["contenttype"];
+		}
 		//$contenttype='text/plain';
 		$outputencoding='UTF-8';
 
-		if ($contenttype)       header('Content-Type: '.$contenttype.($outputencoding?'; charset='.$outputencoding:''));
-		if ($attachment) 		header('Content-Disposition: attachment; filename="'.$shortfilename.'"');
+		if ($contenttype) {
+			header('Content-Type: '.$contenttype.($outputencoding?'; charset='.$outputencoding:''));
+		}
+		if ($attachment) {
+			header('Content-Disposition: attachment; filename="'.$shortfilename.'"');
+		}
 
-		if ($cachedelay) header('Cache-Control: max-age='.$cachedelay.', private, must-revalidate');
-		else header('Cache-Control: private, must-revalidate');
+		if ($cachedelay) {
+			header('Cache-Control: max-age='.$cachedelay.', private, must-revalidate');
+		} else {
+			header('Cache-Control: private, must-revalidate');
+		}
 
 		// Clean parameters
 		$outputfile=$conf->agenda->dir_temp.'/'.$filename;
 		$result=readfile($outputfile);
-		if (! $result) print 'File '.$outputfile.' was empty.';
+		if (! $result) {
+			print 'File '.$outputfile.' was empty.';
+		}
 
 	    //header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
 		exit;
-	}
-	else
+	} else
 	{
 		print 'Error '.$agenda->error;
 
@@ -179,31 +245,43 @@ 
 	if ($result >= 0)
 	{
 		$attachment = false;
-		if (isset($_GET["attachment"])) $attachment=$_GET["attachment"];
+		if (isset($_GET["attachment"])) {
+			$attachment=$_GET["attachment"];
+		}
 		//$attachment = false;
 		$contenttype='application/rss+xml';
-		if (isset($_GET["contenttype"])) $contenttype=$_GET["contenttype"];
+		if (isset($_GET["contenttype"])) {
+			$contenttype=$_GET["contenttype"];
+		}
 		//$contenttype='text/plain';
 		$outputencoding='UTF-8';
 
-		if ($contenttype)       header('Content-Type: '.$contenttype.($outputencoding?'; charset='.$outputencoding:''));
-		if ($attachment) 		header('Content-Disposition: attachment; filename="'.$filename.'"');
+		if ($contenttype) {
+			header('Content-Type: '.$contenttype.($outputencoding?'; charset='.$outputencoding:''));
+		}
+		if ($attachment) {
+			header('Content-Disposition: attachment; filename="'.$filename.'"');
+		}
 
 		// Ajout directives pour resoudre bug IE
 		//header('Cache-Control: Public, must-revalidate');
 		//header('Pragma: public');
-		if ($cachedelay) header('Cache-Control: max-age='.$cachedelay.', private, must-revalidate');
-		else header('Cache-Control: private, must-revalidate');
+		if ($cachedelay) {
+			header('Cache-Control: max-age='.$cachedelay.', private, must-revalidate');
+		} else {
+			header('Cache-Control: private, must-revalidate');
+		}
 
 		// Clean parameters
 		$outputfile=$conf->agenda->dir_temp.'/'.$filename;
 		$result=readfile($outputfile);
-		if (! $result) print 'File '.$outputfile.' was empty.';
+		if (! $result) {
+			print 'File '.$outputfile.' was empty.';
+		}
 
 	//	header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
 		exit;
-	}
-	else
+	} else
 	{
 		print 'Error '.$agenda->error;
 

htdocs/public/members/public_card.php

Indentation +1 added lines, -1 removed lines

@@ -152,7 +152,7 @@
 */
 function llxFooterVierge()
 {
-    printCommonFooter('public');
+	printCommonFooter('public');
 
 	print "</body>\n";
 	print "</html>\n";

Braces +15 added lines, -7 removed lines

@@ -31,7 +31,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.'/adherents/class/adherent.class.php';
@@ -39,7 +41,9 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Security check
-if (empty($conf->adherent->enabled)) accessforbidden('',0,0,1);
+if (empty($conf->adherent->enabled)) {
+	accessforbidden('',0,0,1);
+}
 
 
 $langs->load("main");
@@ -66,8 +70,11 @@ 
  */
 
 $morehead='';
-if (! empty($conf->global->MEMBER_PUBLIC_CSS)) $morehead='<link rel="stylesheet" type="text/css" href="'.$conf->global->MEMBER_PUBLIC_CSS.'">';
-else $morehead='<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/eldy/style.css.php'.'">';
+if (! empty($conf->global->MEMBER_PUBLIC_CSS)) {
+	$morehead='<link rel="stylesheet" type="text/css" href="'.$conf->global->MEMBER_PUBLIC_CSS.'">';
+} else {
+	$morehead='<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/eldy/style.css.php'.'">';
+}
 
 llxHeaderVierge($langs->trans("MemberCard"), $morehead);
 
@@ -84,8 +91,7 @@ 
 	if (empty($object->public))
 	{
 		 print $langs->trans("ErrorThisMemberIsNotPublic");
-	}
-	else
+	} else
 	{
 		print '<table class="public_border" cellspacing="0" width="100%" cellpadding="3">';
 
@@ -140,7 +146,9 @@ 
 	print "<html>\n";
 	print "<head>\n";
 	print "<title>".$title."</title>\n";
-	if ($head) print $head."\n";
+	if ($head) {
+		print $head."\n";
+	}
 	print "</head>\n";
 	print '<body class="public_body">'."\n";
 }

htdocs/public/members/public_list.php

Indentation +6 added lines, -6 removed lines

@@ -58,10 +58,10 @@ 
 
 	header("Content-type: text/html; charset=".$conf->file->character_set_client);
 	print "<html>\n";
-    print "<head>\n";
-    print "<title>".$title."</title>\n";
-    if ($head) print $head."\n";
-    print "</head>\n";
+	print "<head>\n";
+	print "<title>".$title."</title>\n";
+	if ($head) print $head."\n";
+	print "</head>\n";
 	print '<body class="public_body">'."\n";
 }
 
@@ -72,9 +72,9 @@ 
  */
 function llxFooterVierge()
 {
-    printCommonFooter('public');
+	printCommonFooter('public');
 
-    print "</body>\n";
+	print "</body>\n";
 	print "</html>\n";
 }
 

Braces +16 added lines, -9 removed lines

@@ -31,12 +31,16 @@ 
 // 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';
 
 // Security check
-if (empty($conf->adherent->enabled)) accessforbidden('',0,0,1);
+if (empty($conf->adherent->enabled)) {
+	accessforbidden('',0,0,1);
+}
 
 
 $langs->load("main");
@@ -60,7 +64,9 @@ 
 	print "<html>\n";
     print "<head>\n";
     print "<title>".$title."</title>\n";
-    if ($head) print $head."\n";
+    if ($head) {
+    	print $head."\n";
+    }
     print "</head>\n";
 	print '<body class="public_body">'."\n";
 }
@@ -102,8 +108,11 @@ 
 $form = new Form($db);
 
 $morehead='';
-if (! empty($conf->global->MEMBER_PUBLIC_CSS)) $morehead='<link rel="stylesheet" type="text/css" href="'.$conf->global->MEMBER_PUBLIC_CSS.'">';
-else $morehead='<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/eldy/style.css.php'.'">';
+if (! empty($conf->global->MEMBER_PUBLIC_CSS)) {
+	$morehead='<link rel="stylesheet" type="text/css" href="'.$conf->global->MEMBER_PUBLIC_CSS.'">';
+} else {
+	$morehead='<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/eldy/style.css.php'.'">';
+}
 
 llxHeaderVierge($langs->trans("ListOfValidatedPublicMembers"), $morehead);
 
@@ -155,8 +164,7 @@ 
 			print '<td>';
 			print $form->showphoto('memberphoto', $objp, 64);
 			print '</td>'."\n";
-		}
-		else
+		} else
 		{
 			print "<td>&nbsp;</td>\n";
 		}
@@ -164,8 +172,7 @@ 
 		$i++;
 	}
 	print "</table>";
-}
-else
+} else
 {
 	dol_print_error($db);
 }

htdocs/public/emailing/mailing-read.php

Indentation +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 
 	$resql=$db->query($sql);
 
-    //Update status communication of contact prospect
+	//Update status communication of contact prospect
 	$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=3 WHERE fk_stcomm != -1 AND rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.tag = '".$db->escape($tag)."' AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
 	dol_syslog("public/emailing/mailing-read.php : Mail read contact : ".$sql, LOG_DEBUG);
 

Braces +19 added lines, -5 removed lines

@@ -25,11 +25,25 @@
  *      \brief      Script use to update mail status if destinaries read it (if images during mail read are display)
  */
 
-if (! defined('NOLOGIN'))        define("NOLOGIN",1);			// This means this output page does not require to be logged.
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');		// Do not check anti CSRF attack test
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');	// Do not check anti POST attack test
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');	// If there is no need to load and show top and left menu
+if (! defined('NOLOGIN')) {
+	define("NOLOGIN",1);
+}
+// This means this output page does not require to be logged.
+if (! defined('NOREQUIRETRAN')) {
+	define('NOREQUIRETRAN','1');
+}
+if (! defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK','1');
+}
+// Do not check anti CSRF attack test
+if (! defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL','1');
+}
+// Do not check anti POST attack test
+if (! defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU','1');
+}
+// If there is no need to load and show top and left menu
 
 /**
  * Header empty

htdocs/public/emailing/mailing-unsubscribe.php

Indentation +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
 	$resql=$db->query($sql);
 	if (! $resql) dol_print_error($db);
 
-    // Update status communication of contact prospect
+	// Update status communication of contact prospect
 	$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET no_email=1 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE tag = '".$db->escape($tag)."' AND source_type='contact' AND source_id is not null)";
 	dol_syslog("public/emailing/mailing-unsubscribe.php : Mail unsubcribe contact : ".$sql, LOG_DEBUG);
 

Braces +24 added lines, -7 removed lines

@@ -26,9 +26,18 @@ 
  *      \brief      Script use to update unsubcribe contact to prospect mailing list
  */
 
-if (! defined('NOLOGIN'))        define("NOLOGIN",1);			// This means this output page does not require to be logged.
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');		// Do not check anti CSRF attack test
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');	// If there is no need to load and show top and left menu
+if (! defined('NOLOGIN')) {
+	define("NOLOGIN",1);
+}
+// This means this output page does not require to be logged.
+if (! defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK','1');
+}
+// Do not check anti CSRF attack test
+if (! defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU','1');
+}
+// If there is no need to load and show top and left menu
 
 /**
  * Header empty
@@ -78,21 +87,27 @@ 
 	dol_syslog("public/emailing/mailing-unsubscribe.php : Mail unsubcribe : ".$sql, LOG_DEBUG);
 
 	$resql=$db->query($sql);
-	if (! $resql) dol_print_error($db);
+	if (! $resql) {
+		dol_print_error($db);
+	}
 
 	// Update status communication of thirdparty prospect
 	$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=-1 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE tag='".$db->escape($tag)."' AND source_type='thirdparty' AND source_id is not null)";
 	dol_syslog("public/emailing/mailing-unsubscribe.php : Mail unsubcribe thirdparty : ".$sql, LOG_DEBUG);
 
 	$resql=$db->query($sql);
-	if (! $resql) dol_print_error($db);
+	if (! $resql) {
+		dol_print_error($db);
+	}
 
     // Update status communication of contact prospect
 	$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET no_email=1 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE tag = '".$db->escape($tag)."' AND source_type='contact' AND source_id is not null)";
 	dol_syslog("public/emailing/mailing-unsubscribe.php : Mail unsubcribe contact : ".$sql, LOG_DEBUG);
 
 	$resql=$db->query($sql);
-	if (! $resql) dol_print_error($db);
+	if (! $resql) {
+		dol_print_error($db);
+	}
 
 
 	$sql = "SELECT mc.email";
@@ -100,7 +115,9 @@ 
 	$sql .= " WHERE mc.tag='".$db->escape($tag)."'";
 
 	$resql=$db->query($sql);
-	if (! $resql) dol_print_error($db);
+	if (! $resql) {
+		dol_print_error($db);
+	}
 
 	$obj = $db->fetch_object($resql);
 

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

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

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";
 	}

Indentation +168 added lines, -168 removed lines

@@ -97,12 +97,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'
-	    )
+		)
 	);
 
 
@@ -112,12 +112,12 @@ 
 	// Not visible
 	$alwayshiddencheckedmodules=array('accounting','api','barcode','blockedlog','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
@@ -138,61 +138,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);
@@ -210,32 +210,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;
 	}
@@ -303,49 +303,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'].'">';
@@ -353,69 +353,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++;
@@ -464,13 +464,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";
 }
 
 /**
@@ -480,10 +480,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";
 }
 

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

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/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>