Dolibarr / dolibarr

htdocs/public/agenda/agendaexport.php

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/onlinesign/newonlinesign.php

Braces +84 added lines, -49 removed lines

@@ -33,7 +33,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.'/core/lib/company.lib.php';
@@ -133,7 +135,9 @@ 
  */
 
 $head='';
-if (! empty($conf->global->MAIN_SIGN_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->MAIN_SIGN_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+if (! empty($conf->global->MAIN_SIGN_CSS_URL)) {
+	$head='<link rel="stylesheet" type="text/css" href="'.$conf->global->MAIN_SIGN_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+}
 
 $conf->dol_hide_topmenu=1;
 $conf->dol_hide_leftmenu=1;
@@ -170,16 +174,18 @@ 
 $logosmall=$mysoc->logo_small;
 $logo=$mysoc->logo;
 $paramlogo='ONLINE_SIGN_LOGO_'.$suffix;
-if (! empty($conf->global->$paramlogo)) $logosmall=$conf->global->$paramlogo;
-else if (! empty($conf->global->ONLINE_SIGN_LOGO)) $logosmall=$conf->global->ONLINE_SIGN_LOGO;
+if (! empty($conf->global->$paramlogo)) {
+	$logosmall=$conf->global->$paramlogo;
+} else if (! empty($conf->global->ONLINE_SIGN_LOGO)) {
+	$logosmall=$conf->global->ONLINE_SIGN_LOGO;
+}
 //print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
 // Define urllogo
 $urllogo='';
 if (! empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall))
 {
 	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('thumbs/'.$logosmall);
-}
-elseif (! empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
+} elseif (! empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
 {
 	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode($logo);
 	$width=96;
@@ -189,7 +195,9 @@ 
 {
 	print '<tr>';
 	print '<td align="center"><img id="dolpaymentlogo" title="'.$title.'" src="'.$urllogo.'"';
-	if ($width) print ' width="'.$width.'"';
+	if ($width) {
+		print ' width="'.$width.'"';
+	}
 	print '></td>';
 	print '</tr>'."\n";
 }
@@ -199,8 +207,11 @@ 
 if (! empty($conf->global->ONLINE_SIGN_NEWFORM_TEXT))
 {
     $langs->load("members");
-    if (preg_match('/^\((.*)\)$/',$conf->global->ONLINE_SIGN_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
-    else $text.=$conf->global->ONLINE_SIGN_NEWFORM_TEXT."<br>\n";
+    if (preg_match('/^\((.*)\)$/',$conf->global->ONLINE_SIGN_NEWFORM_TEXT,$reg)) {
+    	$text.=$langs->trans($reg[1])."<br>\n";
+    } else {
+    	$text.=$conf->global->ONLINE_SIGN_NEWFORM_TEXT."<br>\n";
+    }
     $text='<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
 }
 if (empty($text))
@@ -254,8 +265,7 @@ 
 	{
 		$mesg=$order->error;
 		$error++;
-	}
-	else
+	} else
 	{
 		$result=$order->fetch_thirdparty($order->socid);
 	}
@@ -299,16 +309,19 @@ 
 	{
 		$mesg=$invoice->error;
 		$error++;
-	}
-	else
+	} else
 	{
 		$result=$invoice->fetch_thirdparty($invoice->socid);
 	}
 
-    if ($action != 'dosign') // Do not change amount if we just click on first dosign
+    if ($action != 'dosign') {
+    	// Do not change amount if we just click on first dosign
     {
     	$amount=price2num($invoice->total_ttc - $invoice->getSommePaiement());
-        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+    }
+        if (GETPOST("amount",'int')) {
+        	$amount=GETPOST("amount",'int');
+        }
         $amount=price2num($amount);
     }
 
@@ -349,8 +362,7 @@ 
 	{
 		$mesg=$contractline->error;
 		$error++;
-	}
-	else
+	} else
 	{
 		if ($contractline->fk_contrat > 0)
 		{
@@ -359,23 +371,23 @@ 
 			if ($result > 0)
 			{
 				$result=$contract->fetch_thirdparty($contract->socid);
-			}
-			else
+			} else
 			{
 				$mesg=$contract->error;
 				$error++;
 			}
-		}
-		else
+		} else
 		{
 			$mesg='ErrorRecordNotFound';
 			$error++;
 		}
 	}
 
-    if ($action != 'dosign') // Do not change amount if we just click on first dosign
+    if ($action != 'dosign') {
+    	// Do not change amount if we just click on first dosign
     {
     	$amount=$contractline->total_ttc;
+    }
     	if ($contractline->fk_product)
     	{
     		$product=new Product($db);
@@ -387,8 +399,7 @@ 
     			$pu_ht = $product->multiprices[$contract->thirdparty->price_level];
     			$pu_ttc = $product->multiprices_ttc[$contract->thirdparty->price_level];
     			$price_base_type = $product->multiprices_base_type[$contract->thirdparty->price_level];
-    		}
-    		else
+    		} else
     		{
     			$pu_ht = $product->price;
     			$pu_ttc = $product->price_ttc;
@@ -402,12 +413,16 @@ 
     			exit;
     		}
     	}
-        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+        if (GETPOST("amount",'int')) {
+        	$amount=GETPOST("amount",'int');
+        }
         $amount=price2num($amount);
     }
 
 	$qty=1;
-	if (GETPOST('qty')) $qty=GETPOST('qty');
+	if (GETPOST('qty')) {
+		$qty=GETPOST('qty');
+	}
 
 	// Creditor
 
@@ -428,7 +443,9 @@ 
 	{
 		$text.='<br>'.$product->ref.($product->label?' - '.$product->label:'');
 	}
-	if ($contractline->description) $text.='<br>'.dol_htmlentitiesbr($contractline->description);
+	if ($contractline->description) {
+		$text.='<br>'.dol_htmlentitiesbr($contractline->description);
+	}
 	//if ($contractline->date_fin_validite) {
 	//	$text.='<br>'.$langs->trans("DateEndPlanned").': ';
 	//	$text.=dol_print_date($contractline->date_fin_validite);
@@ -459,8 +476,7 @@ 
 			if ($product->duration_value > 1)
 			{
 				$dur=array("h"=>$langs->trans("Hours"),"d"=>$langs->trans("DurationDays"),"w"=>$langs->trans("DurationWeeks"),"m"=>$langs->trans("DurationMonths"),"y"=>$langs->trans("DurationYears"));
-			}
-			else
+			} else
 			{
 				$dur=array("h"=>$langs->trans("Hour"),"d"=>$langs->trans("DurationDay"),"w"=>$langs->trans("DurationWeek"),"m"=>$langs->trans("DurationMonth"),"y"=>$langs->trans("DurationYear"));
 			}
@@ -475,14 +491,15 @@ 
 	// Amount
 
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
-	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
+	if (empty($amount)) {
+		print ' ('.$langs->trans("ToComplete").')';
+	}
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
 	if (empty($amount) || ! is_numeric($amount))
 	{
         print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
 	    print '<input class="flat" size=8 type="text" name="newamount" value="'.GETPOST("newamount","int").'">';
-	}
-	else {
+	} else {
 		print '<b>'.price($amount).'</b>';
         print '<input type="hidden" name="amount" value="'.$amount.'">';
 		print '<input type="hidden" name="newamount" value="'.$amount.'">';
@@ -509,16 +526,19 @@ 
 	{
 		$mesg=$member->error;
 		$error++;
-	}
-	else
+	} else
 	{
 		$subscription=new Subscription($db);
 	}
 
-    if ($action != 'dosign') // Do not change amount if we just click on first dosign
+    if ($action != 'dosign') {
+    	// Do not change amount if we just click on first dosign
     {
     	$amount=$subscription->total_ttc;
-        if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+    }
+        if (GETPOST("amount",'int')) {
+        	$amount=GETPOST("amount",'int');
+        }
         $amount=price2num($amount);
     }
 
@@ -537,8 +557,11 @@ 
 
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Member");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>';
-	if ($member->morphy == 'mor' && ! empty($member->societe)) print $member->societe;
-	else print $member->getFullName($langs);
+	if ($member->morphy == 'mor' && ! empty($member->societe)) {
+		print $member->societe;
+	} else {
+		print $member->getFullName($langs);
+	}
 	print '</b>';
 
 	// Object
@@ -564,7 +587,9 @@ 
 		print '</td><td class="CTableRow'.($var?'1':'2').'">'.price($member->last_subscription_amount);
 		print '</td></tr>'."\n";
 
-		if (empty($amount) && ! GETPOST('newamount')) $_GET['newamount']=$member->last_subscription_amount;
+		if (empty($amount) && ! GETPOST('newamount')) {
+			$_GET['newamount']=$member->last_subscription_amount;
+		}
 	}
 
 	// Amount
@@ -573,20 +598,25 @@ 
 	if (empty($amount))
 	{
 		print ' ('.$langs->trans("ToComplete");
-		if (! empty($conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO)) print ' - <a href="'.$conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO.'" rel="external" target="_blank">'.$langs->trans("SeeHere").'</a>';
+		if (! empty($conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO)) {
+			print ' - <a href="'.$conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO.'" rel="external" target="_blank">'.$langs->trans("SeeHere").'</a>';
+		}
 		print ')';
 	}
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
 	if (empty($amount) || ! is_numeric($amount))
 	{
 	    $valtoshow=GETPOST("newamount",'int');
-	    if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
+	    if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) {
+	    	$valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
+	    }
         print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
 	    print '<input class="flat" size="8" type="text" name="newamount" value="'.$valtoshow.'">';
-	}
-	else {
+	} else {
 	    $valtoshow=$amount;
-	    if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
+	    if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) {
+	    	$valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
+	    }
 	    print '<b>'.price($valtoshow).'</b>';
         print '<input type="hidden" name="amount" value="'.$valtoshow.'">';
 		print '<input type="hidden" name="newamount" value="'.$valtoshow.'">';
@@ -601,16 +631,21 @@ 
 
 
 
-if (! $found && ! $mesg) $mesg=$langs->trans("ErrorBadParameters");
+if (! $found && ! $mesg) {
+	$mesg=$langs->trans("ErrorBadParameters");
+}
 
-if ($mesg) print '<tr><td align="center" colspan="2"><br><div class="warning">'.$mesg.'</div></td></tr>'."\n";
+if ($mesg) {
+	print '<tr><td align="center" colspan="2"><br><div class="warning">'.$mesg.'</div></td></tr>'."\n";
+}
 
 print '</table>'."\n";
 print "\n";
 
 if ($action != 'dosign')
 {
-    if ($found && ! $error)	// We are in a management option and no error
+    if ($found && ! $error) {
+    	// We are in a management option and no error
     {
 
 
@@ -619,8 +654,8 @@ 
     {
     	dol_print_error_email('ERRORNEWONLINESIGNPAYPAL');
     }
-}
-else
+    }
+} else
 {
     // Print
 }

htdocs/public/members/public_card.php

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

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

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

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

htdocs/public/opensurvey/studs.php

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

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>