alxarafe / alixar

dolibarr/scripts/invoices/email_unpaid_invoices_to_customers.php

Braces +67 added lines, -35 removed lines

@@ -76,20 +76,34 @@ 
 $error = 0;
 print $script_file." launched with mode ".$mode." default lang=".$langs->defaultlang.(is_numeric($duration_value)?" delay=".$duration_value:"").(is_numeric($duration_value2)?" after=".$duration_value2:"")."\n";
 
-if ($mode != 'confirm') $conf->global->MAIN_DISABLE_ALL_MAILS=1;
+if ($mode != 'confirm') {
+    $conf->global->MAIN_DISABLE_ALL_MAILS=1;
+}
 
 $sql = "SELECT f.ref, f.total_ttc, f.date_lim_reglement as due_date,";
 $sql.= " s.rowid as sid, s.nom as name, s.email, s.default_lang";
-if ($targettype == 'contacts') $sql.= ", sp.rowid as cid, sp.firstname as cfirstname, sp.lastname as clastname, sp.email as cemail";
+if ($targettype == 'contacts') {
+    $sql.= ", sp.rowid as cid, sp.firstname as cfirstname, sp.lastname as clastname, sp.email as cemail";
+}
 $sql.= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
-if ($targettype == 'contacts') $sql.= ", ".MAIN_DB_PREFIX."socpeople as sp";
+if ($targettype == 'contacts') {
+    $sql.= ", ".MAIN_DB_PREFIX."socpeople as sp";
+}
 $sql.= " WHERE f.fk_statut = 1 AND f.paye = 0";
 $sql.= " AND f.fk_soc = s.rowid";
-if (is_numeric($duration_value2)) $sql.= " AND f.date_lim_reglement >= '".$db->idate(dol_time_plus_duree($now, $duration_value2, "d"))."'";
-if (is_numeric($duration_value)) $sql.= " AND f.date_lim_reglement < '".$db->idate(dol_time_plus_duree($now, $duration_value, "d"))."'";
-if ($targettype == 'contacts') $sql.= " AND s.rowid = sp.fk_soc";
+if (is_numeric($duration_value2)) {
+    $sql.= " AND f.date_lim_reglement >= '".$db->idate(dol_time_plus_duree($now, $duration_value2, "d"))."'";
+}
+if (is_numeric($duration_value)) {
+    $sql.= " AND f.date_lim_reglement < '".$db->idate(dol_time_plus_duree($now, $duration_value, "d"))."'";
+}
+if ($targettype == 'contacts') {
+    $sql.= " AND s.rowid = sp.fk_soc";
+}
 $sql.= " ORDER BY";
-if ($targettype == 'contacts') $sql.= " sp.email, sp.rowid,";
+if ($targettype == 'contacts') {
+    $sql.= " sp.email, sp.rowid,";
+}
 $sql.= " s.email ASC, s.rowid ASC, f.ref ASC";	// Order by email to allow one message per email
 
 //print $sql;
@@ -116,9 +130,15 @@ 
 
             // Check if this record is a break after previous one
             $startbreak=false;
-			if ($newemail <> $oldemail || $oldemail == 'none') $startbreak=true;
-			if ($obj->sid && $obj->sid <> $oldsid) $startbreak=true;
-			if ($obj->cid && $obj->cid <> $oldcid) $startbreak=true;
+			if ($newemail <> $oldemail || $oldemail == 'none') {
+			    $startbreak=true;
+			}
+			if ($obj->sid && $obj->sid <> $oldsid) {
+			    $startbreak=true;
+			}
+			if ($obj->cid && $obj->cid <> $oldcid) {
+			    $startbreak=true;
+			}
 
             if ($startbreak)
             {
@@ -127,13 +147,15 @@ 
                 {
                    	envoi_mail($mode,$oldemail,$message,$total,$oldlang,$oldtarget);
                    	$trackthirdpartiessent[$oldsid.'|'.$oldemail]='contact id '.$oldcid;
-                }
-                else
+                } else
 				{
                 	if ($oldemail != 'none')
                 	{
-                		if (empty($trackthirdpartiessent[$oldsid.'|'.$oldemail])) print "- No email sent for '".$oldtarget."', total: ".$total."\n";
-                		else print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
+                		if (empty($trackthirdpartiessent[$oldsid.'|'.$oldemail])) {
+                		    print "- No email sent for '".$oldtarget."', total: ".$total."\n";
+                		} else {
+                		    print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
+                		}
                 	}
                 }
                 $oldemail = $newemail;
@@ -162,8 +184,11 @@ 
             	$foundtoprocess++;
             }
             print "Unpaid invoice ".$obj->ref.", price ".price2num($obj->total_ttc).", due date ".dol_print_date($db->jdate($obj->due_date),'day').", customer id ".$obj->sid." ".$obj->name.", ".($obj->cid?"contact id ".$obj->cid." ".$obj->clastname." ".$obj->cfirstname.", ":"")."email ".$newemail.", lang ".$outputlangs->defaultlang.": ";
-            if (dol_strlen($newemail)) print "qualified.";
-            else print "disqualified (no email).";
+            if (dol_strlen($newemail)) {
+                print "qualified.";
+            } else {
+                print "disqualified (no email).";
+            }
             print "\n";
 
             unset($outputlangs);
@@ -176,29 +201,31 @@ 
         // Si il reste des envois en buffer
         if ($foundtoprocess)
         {
-            if (dol_strlen($oldemail) && $oldemail != 'none' && empty($trackthirdpartiessent[$oldsid.'|'.$oldemail]))	// Break onto email (new email)
+            if (dol_strlen($oldemail) && $oldemail != 'none' && empty($trackthirdpartiessent[$oldsid.'|'.$oldemail])) {
+                // Break onto email (new email)
             {
        			envoi_mail($mode,$oldemail,$message,$total,$oldlang,$oldtarget);
-       			$trackthirdpartiessent[$oldsid.'|'.$oldemail]='contact id '.$oldcid;
             }
-            else
+       			$trackthirdpartiessent[$oldsid.'|'.$oldemail]='contact id '.$oldcid;
+            } else
 			{
             	if ($oldemail != 'none')
             	{
-            		if (empty($trackthirdpartiessent[$oldsid.'|'.$oldemail])) print "- No email sent for '".$oldtarget."', total: ".$total."\n";
-            		else print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
+            		if (empty($trackthirdpartiessent[$oldsid.'|'.$oldemail])) {
+            		    print "- No email sent for '".$oldtarget."', total: ".$total."\n";
+            		} else {
+            		    print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
+            		}
             	}
             }
         }
-    }
-    else
+    } else
 	{
         print "No unpaid invoices found\n";
     }
 
     exit(0);
-}
-else
+} else
 {
     dol_print_error($db);
     dol_syslog("email_unpaid_invoices_to_customers.php: Error");
@@ -222,7 +249,9 @@ 
 {
     global $conf,$langs;
 
-    if (getenv('DOL_FORCE_EMAIL_TO')) $oldemail=getenv('DOL_FORCE_EMAIL_TO');
+    if (getenv('DOL_FORCE_EMAIL_TO')) {
+        $oldemail=getenv('DOL_FORCE_EMAIL_TO');
+    }
 
     $newlangs=new Translate('',$conf);
     $newlangs->setDefaultLang(empty($userlang)?(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT):$userlang);
@@ -239,15 +268,18 @@ 
     dol_syslog("email_unpaid_invoices_to_customers.php: send mail to ".$oldemail);
 
     $usehtml=0;
-    if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER)) $usehtml+=1;
-    if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_HEADER)) $usehtml+=1;
+    if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER)) {
+        $usehtml+=1;
+    }
+    if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_HEADER)) {
+        $usehtml+=1;
+    }
 
     $allmessage='';
     if (! empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_HEADER))
     {
     	$allmessage.=$conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_HEADER;
-    }
-    else
+    } else
     {
     	$allmessage.= "Dear customer".($usehtml?"<br>\n":"\n").($usehtml?"<br>\n":"\n");
     	$allmessage.= "Please, find a summary of the bills with pending payments from you.".($usehtml?"<br>\n":"\n").($usehtml?"<br>\n":"\n");
@@ -258,7 +290,9 @@ 
     if (! empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER))
     {
     	$allmessage.=$conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER;
-    	if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER)) $usehtml+=1;
+    	if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER)) {
+    	    $usehtml+=1;
+    	}
     }
 
     $mail = new CMailFile(
@@ -286,8 +320,7 @@ 
     		print "Error sending email ".$mail->error."\n";
     		dol_syslog("Error sending email ".$mail->error."\n");
     	}
-    }
-    else
+    } else
     {
     	print "No email sent (test mode)\n";
     	dol_syslog("No email sent (test mode)");
@@ -299,8 +332,7 @@ 
     if ($result)
     {
         return 1;
-    }
-    else
+    } else
     {
         return -1;
     }

dolibarr/scripts/user/sync_users_dolibarr2ldap.php

Braces +2 added lines, -4 removed lines

@@ -101,8 +101,7 @@ 
 		if ($result > 0)
 		{
 			print " - ".$langs->trans("OK");
-		}
-		else
+		} else
 		{
 			$error++;
 			print " - ".$langs->trans("KO").' - '.$ldap->error;
@@ -114,8 +113,7 @@ 
 
 	$ldap->unbind();
 	$ldap->close();
-}
-else
+} else
 {
 	dol_print_error($db);
 }

dolibarr/scripts/user/sync_users_ldap2dolibarr.php

Braces +31 added lines, -21 removed lines

@@ -89,11 +89,19 @@ 
 
 foreach($argv as $key => $val)
 {
-	if ($val == 'commitiferror') $forcecommit=1;
-	if (preg_match('/--server=([^\s]+)$/',$val,$reg)) $conf->global->LDAP_SERVER_HOST=$reg[1];
-	if (preg_match('/--excludeuser=([^\s]+)$/',$val,$reg)) $excludeuser=explode(',',$reg[1]);
-	if (preg_match('/-y$/',$val,$reg)) $confirmed=1;
-}
+	if ($val == 'commitiferror') {
+	    $forcecommit=1;
+	}
+	if (preg_match('/--server=([^\s]+)$/',$val,$reg)) {
+	    $conf->global->LDAP_SERVER_HOST=$reg[1];
+	}
+	if (preg_match('/--excludeuser=([^\s]+)$/',$val,$reg)) {
+	    $excludeuser=explode(',',$reg[1]);
+	}
+	if (preg_match('/-y$/',$val,$reg)) {
+	    $confirmed=1;
+	}
+	}
 
 print "Mails sending disabled (useless in batch mode)\n";
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;	// On bloque les mails
@@ -104,8 +112,13 @@ 
 print "login=".$conf->global->LDAP_ADMIN_DN."\n";
 print "pass=".preg_replace('/./i','*',$conf->global->LDAP_ADMIN_PASS)."\n";
 print "DN to extract=".$conf->global->LDAP_USER_DN."\n";
-if (! empty($conf->global->LDAP_FILTER_CONNECTION)) print 'Filter=('.$conf->global->LDAP_FILTER_CONNECTION.')'."\n";	// Note: filter is defined into function getRecords
-else print 'Filter=('.$conf->global->LDAP_KEY_USERS.'=*)'."\n";
+if (! empty($conf->global->LDAP_FILTER_CONNECTION)) {
+    print 'Filter=('.$conf->global->LDAP_FILTER_CONNECTION.')'."\n";
+}
+// Note: filter is defined into function getRecords
+else {
+    print 'Filter=('.$conf->global->LDAP_KEY_USERS.'=*)'."\n";
+}
 print "----- To Dolibarr database:\n";
 print "type=".$conf->db->type."\n";
 print "host=".$conf->db->host."\n";
@@ -157,8 +170,7 @@ 
 			$i++;
 		}
 	}
-}
-else
+} else
 {
 	dol_print_error($db);
 	exit(-1);
@@ -249,8 +261,7 @@ 
 				{
 					$error++;
 					print ' --> '.$res.' '.$fuser->error;
-				}
-				else
+				} else
 				{
 					print ' --> Updated user id='.$fuser->id.' login='.$fuser->login;
 				}
@@ -261,8 +272,7 @@ 
 				if ($res > 0)
 				{
 					print ' --> Created user id='.$fuser->id.' login='.$fuser->login;
-				}
-				else
+				} else
 				{
 					$error++;
 					print ' --> '.$res.' '.$fuser->error;
@@ -282,24 +292,24 @@ 
 
 		if (! $error || $forcecommit)
 		{
-			if (! $error) print $langs->transnoentities("NoErrorCommitIsDone")."\n";
-			else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+			if (! $error) {
+			    print $langs->transnoentities("NoErrorCommitIsDone")."\n";
+			} else {
+			    print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+			}
 			$db->commit();
-		}
-		else
+		} else
 		{
 			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone",$error)."\n";
 			$db->rollback();
 		}
 		print "\n";
-	}
-	else
+	} else
 	{
 		dol_print_error('',$ldap->error);
 		$error++;
 	}
-}
-else
+} else
 {
 	dol_print_error('',$ldap->error);
 	$error++;

dolibarr/scripts/user/sync_groups_ldap2dolibarr.php

Braces +29 added lines, -19 removed lines

@@ -78,11 +78,19 @@ 
 
 foreach($argv as $key => $val)
 {
-	if ($val == 'commitiferror') $forcecommit=1;
-	if (preg_match('/--server=([^\s]+)$/',$val,$reg)) $conf->global->LDAP_SERVER_HOST=$reg[1];
-	if (preg_match('/--excludeuser=([^\s]+)$/',$val,$reg)) $excludeuser=explode(',',$reg[1]);
-	if (preg_match('/-y$/',$val,$reg)) $confirmed=1;
-}
+	if ($val == 'commitiferror') {
+	    $forcecommit=1;
+	}
+	if (preg_match('/--server=([^\s]+)$/',$val,$reg)) {
+	    $conf->global->LDAP_SERVER_HOST=$reg[1];
+	}
+	if (preg_match('/--excludeuser=([^\s]+)$/',$val,$reg)) {
+	    $excludeuser=explode(',',$reg[1]);
+	}
+	if (preg_match('/-y$/',$val,$reg)) {
+	    $confirmed=1;
+	}
+	}
 
 print "Mails sending disabled (useless in batch mode)\n";
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;	// On bloque les mails
@@ -152,8 +160,7 @@ 
 				if ($res > 0)
 				{
 					print ' --> Updated group id='.$group->id.' name='.$group->name;
-				}
-				else
+				} else
 				{
 					$error++;
 					print ' --> '.$res.' '.$group->error;
@@ -166,8 +173,7 @@ 
 				if ($res > 0)
 				{
 					print ' --> Created group id='.$group->id.' name='.$group->name;
-				}
-				else
+				} else
 				{
 					$error++;
 					print ' --> '.$res.' '.$group->error;
@@ -182,7 +188,9 @@ 
 			$userList = array();
 			$userIdList = array();
 			foreach($ldapgroup[$conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS] as $key => $userdn) {
-				if($key === 'count') continue;
+				if($key === 'count') {
+				    continue;
+				}
 				if(empty($userList[$userdn])) { // Récupération de l'utilisateur
 					// Schéma rfc2307: les membres sont listés dans l'attribut memberUid sous form de login uniquement
 					if ($conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS === 'memberUid'){
@@ -191,7 +199,9 @@ 
 						$userFilter = explode(',', $userdn);
 						$userKey = $ldap->getAttributeValues('('.$userFilter[0].')', $conf->global->LDAP_KEY_USERS);
 					}
-					if(!is_array($userKey)) continue;
+					if(!is_array($userKey)) {
+					    continue;
+					}
 
 					$fuser = new User($db);
 
@@ -226,24 +236,24 @@ 
 
 		if (! $error || $forcecommit)
 		{
-			if (! $error) print $langs->transnoentities("NoErrorCommitIsDone")."\n";
-			else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+			if (! $error) {
+			    print $langs->transnoentities("NoErrorCommitIsDone")."\n";
+			} else {
+			    print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+			}
 			$db->commit();
-		}
-		else
+		} else
 		{
 			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone",$error)."\n";
 			$db->rollback();
 		}
 		print "\n";
-	}
-	else
+	} else
 	{
 		dol_print_error('',$ldap->error);
 		$error++;
 	}
-}
-else
+} else
 {
 	dol_print_error('',$ldap->error);
 	$error++;

dolibarr/scripts/members/sync_members_ldap2dolibarr.php

Braces +31 added lines, -21 removed lines

@@ -99,10 +99,16 @@ 
 $typeid=$argv[2];
 foreach($argv as $key => $val)
 {
-	if ($val == 'commitiferror') $forcecommit=1;
-	if (preg_match('/--server=([^\s]+)$/',$val,$reg)) $conf->global->LDAP_SERVER_HOST=$reg[1];
-	if (preg_match('/-y$/',$val,$reg)) $confirmed=1;
-}
+	if ($val == 'commitiferror') {
+	    $forcecommit=1;
+	}
+	if (preg_match('/--server=([^\s]+)$/',$val,$reg)) {
+	    $conf->global->LDAP_SERVER_HOST=$reg[1];
+	}
+	if (preg_match('/-y$/',$val,$reg)) {
+	    $confirmed=1;
+	}
+	}
 
 print "Mails sending disabled (useless in batch mode)\n";
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;	// On bloque les mails
@@ -113,8 +119,13 @@ 
 print "login=".$conf->global->LDAP_ADMIN_DN."\n";
 print "pass=".preg_replace('/./i','*',$conf->global->LDAP_ADMIN_PASS)."\n";
 print "DN to extract=".$conf->global->LDAP_MEMBER_DN."\n";
-if (! empty($conf->global->LDAP_MEMBER_FILTER)) print 'Filter=('.$conf->global->LDAP_MEMBER_FILTER.')'."\n";	// Note: filter is defined into function getRecords
-else print 'Filter=('.$conf->global->LDAP_KEY_MEMBERS.'=*)'."\n";
+if (! empty($conf->global->LDAP_MEMBER_FILTER)) {
+    print 'Filter=('.$conf->global->LDAP_MEMBER_FILTER.')'."\n";
+}
+// Note: filter is defined into function getRecords
+else {
+    print 'Filter=('.$conf->global->LDAP_KEY_MEMBERS.'=*)'."\n";
+}
 print "----- To Dolibarr database:\n";
 print "type=".$conf->db->type."\n";
 print "host=".$conf->db->host."\n";
@@ -171,8 +182,7 @@ 
 			$i++;
 		}
 	}
-}
-else
+} else
 {
 	dol_print_error($db);
 	exit(-1);
@@ -246,8 +256,7 @@ 
 			if ($member_id > 0)
 			{
 				print ' --> Created member id='.$member_id.' login='.$member->login;
-			}
-			else
+			} else
 			{
 				$error++;
 				print ' --> '.$member->error;
@@ -268,8 +277,7 @@ 
 			{
 				$datelast=dol_stringtotime($ldapuser[$conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE]);
 				$pricelast=price2num($ldapuser[$conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT]);
-			}
-			elseif ($conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION)
+			} elseif ($conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION)
 			{
 				$datelast=dol_time_plus_duree(dol_stringtotime($ldapuser[$conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION]),-1,'y')+60*60*24;
 				$pricelast=price2num($ldapuser[$conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT]);
@@ -279,7 +287,9 @@ 
 				{
 					// On ne va inserer que la premiere
 					$datelast=0;
-					if (! $pricefirst && $pricelast) $pricefirst = $pricelast;
+					if (! $pricefirst && $pricelast) {
+					    $pricefirst = $pricelast;
+					}
 				}
 			}
 
@@ -303,24 +313,24 @@ 
 
 		if (! $error || $forcecommit)
 		{
-			if (! $error) print $langs->transnoentities("NoErrorCommitIsDone")."\n";
-			else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+			if (! $error) {
+			    print $langs->transnoentities("NoErrorCommitIsDone")."\n";
+			} else {
+			    print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+			}
 			$db->commit();
-		}
-		else
+		} else
 		{
 			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone",$error)."\n";
 			$db->rollback();
 		}
 		print "\n";
-	}
-	else
+	} else
 	{
 		dol_print_error('',$ldap->error);
 		$error++;
 	}
-}
-else
+} else
 {
 	dol_print_error('',$ldap->error);
 	$error++;

dolibarr/scripts/members/sync_members_dolibarr2ldap.php

Braces +6 added lines, -6 removed lines

@@ -61,8 +61,10 @@ 
 
 foreach($argv as $key => $val)
 {
-	if (preg_match('/-y$/',$val,$reg)) $confirmed=1;
-}
+	if (preg_match('/-y$/',$val,$reg)) {
+	    $confirmed=1;
+	}
+	}
 
 $now=$argv[1];
 
@@ -150,8 +152,7 @@ 
 		if ($result > 0)
 		{
 			print " - ".$langs->transnoentities("OK");
-		}
-		else
+		} else
 		{
 			$error++;
 			print " - ".$langs->transnoentities("KO").' - '.$ldap->error;
@@ -163,8 +164,7 @@ 
 
 	$ldap->unbind();
 	$ldap->close();
-}
-else
+} else
 {
 	dol_print_error($db);
 }

dolibarr/scripts/members/sync_members_types_dolibarr2ldap.php

Braces +3 added lines, -6 removed lines

@@ -105,8 +105,7 @@ 
 			if ($result > 0)
 			{
 				print " - ".$langs->trans("OK");
-			}
-			else
+			} else
 			{
 				$error++;
 				print " - ".$langs->trans("KO").' - '.$ldap->error;
@@ -118,12 +117,10 @@ 
 
 		$ldap->unbind();
 		$ldap->close();
-	}
-	else {
+	} else {
 		print $ldap->error;
 	}
-}
-else
+} else
 {
 	dol_print_error($db);
 }

dolibarr/scripts/members/sync_members_types_ldap2dolibarr.php

Braces +23 added lines, -17 removed lines

@@ -78,11 +78,19 @@ 
 
 foreach($argv as $key => $val)
 {
-	if ($val == 'commitiferror') $forcecommit=1;
-	if (preg_match('/--server=([^\s]+)$/',$val,$reg)) $conf->global->LDAP_SERVER_HOST=$reg[1];
-	if (preg_match('/--excludeuser=([^\s]+)$/',$val,$reg)) $excludeuser=explode(',',$reg[1]);
-	if (preg_match('/-y$/',$val,$reg)) $confirmed=1;
-}
+	if ($val == 'commitiferror') {
+	    $forcecommit=1;
+	}
+	if (preg_match('/--server=([^\s]+)$/',$val,$reg)) {
+	    $conf->global->LDAP_SERVER_HOST=$reg[1];
+	}
+	if (preg_match('/--excludeuser=([^\s]+)$/',$val,$reg)) {
+	    $excludeuser=explode(',',$reg[1]);
+	}
+	if (preg_match('/-y$/',$val,$reg)) {
+	    $confirmed=1;
+	}
+	}
 
 print "Mails sending disabled (useless in batch mode)\n";
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;	// On bloque les mails
@@ -151,8 +159,7 @@ 
 				if ($res > 0)
 				{
 					print ' --> Updated member type id='.$membertype->id.' name='.$membertype->label;
-				}
-				else
+				} else
 				{
 					$error++;
 					print ' --> '.$res.' '.$membertype->error;
@@ -165,8 +172,7 @@ 
 				if ($res > 0)
 				{
 					print ' --> Created member type id='.$membertype->id.' name='.$membertype->label;
-				}
-				else
+				} else
 				{
 					$error++;
 					print ' --> '.$res.' '.$membertype->error;
@@ -179,24 +185,24 @@ 
 
 		if (! $error || $forcecommit)
 		{
-			if (! $error) print $langs->transnoentities("NoErrorCommitIsDone")."\n";
-			else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+			if (! $error) {
+			    print $langs->transnoentities("NoErrorCommitIsDone")."\n";
+			} else {
+			    print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+			}
 			$db->commit();
-		}
-		else
+		} else
 		{
 			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone",$error)."\n";
 			$db->rollback();
 		}
 		print "\n";
-	}
-	else
+	} else
 	{
 		dol_print_error('',$ldap->error);
 		$error++;
 	}
-}
-else
+} else
 {
 	dol_print_error('',$ldap->error);
 	$error++;

dolibarr/scripts/product/migrate_picture_path.php

Braces +2 added lines, -4 removed lines

@@ -78,8 +78,7 @@ 
 			print " migrating product id=".$product->id." ref=".$product->ref."\n";
 			migrate_product_photospath($product);
 		}
-	}
-	else
+	} else
 	{
 		print "\n sql error ".$sql;
 		exit;
@@ -133,8 +132,7 @@ 
 		    			}
 //		    			dol_delete_dir($origin.'/'.$file);
         			}
-    			}
-    			else
+    			} else
     			{
     				if (dol_is_file($origin.'/'.$file) )
     				{