alxarafe / alixar

dolibarr/htdocs/api/class/api_setup.class.php

Braces +58 added lines, -41 removed lines

@@ -201,8 +201,7 @@ 
 
         if ($country->fetch($id) < 0) {
             throw new RestException(503, 'Error when retrieving country : '.$country->error);
-        }
-        else if ($country->fetch($id) == 0) {
+        } else if ($country->fetch($id) == 0) {
             throw new RestException(404, 'country not found');
         }
 
@@ -340,8 +339,12 @@ 
         $sql = "SELECT id, code, type, libelle as label, module";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as t";
         $sql.= " WHERE t.active = 1";
-        if ($type) $sql.=" AND t.type LIKE '%" . $this->db->escape($type) . "%'";
-        if ($module)    $sql.=" AND t.module LIKE '%" . $this->db->escape($module) . "%'";
+        if ($type) {
+            $sql.=" AND t.type LIKE '%" . $this->db->escape($type) . "%'";
+        }
+        if ($module) {
+            $sql.=" AND t.module LIKE '%" . $this->db->escape($module) . "%'";
+        }
         // Add sql filters
         if ($sqlfilters)
         {
@@ -402,7 +405,9 @@ 
         $sql = "SELECT rowid, code, label, module";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_civility as t";
         $sql.= " WHERE t.active = 1";
-        if ($module)    $sql.=" AND t.module LIKE '%" . $this->db->escape($module) . "%'";
+        if ($module) {
+            $sql.=" AND t.module LIKE '%" . $this->db->escape($module) . "%'";
+        }
         // Add sql filters
         if ($sqlfilters)
         {
@@ -458,13 +463,19 @@ 
     {
         $list = array();
 
-        if ($type == 'thirdparty') $type='societe';
-        if ($type == 'contact') $type='socpeople';
+        if ($type == 'thirdparty') {
+            $type='societe';
+        }
+        if ($type == 'contact') {
+            $type='socpeople';
+        }
 
         $sql = "SELECT t.rowid, t.name, t.label, t.type, t.size, t.elementtype, t.fieldunique, t.fieldrequired, t.param, t.pos, t.alwayseditable, t.perms, t.list, t.fielddefault, t.fieldcomputed";
         $sql.= " FROM ".MAIN_DB_PREFIX."extrafields as t";
         $sql.= " WHERE t.entity IN (".getEntity('extrafields').")";
-        if (! empty($type)) $sql.= " AND t.elementtype = '".$this->db->escape($type)."'";
+        if (! empty($type)) {
+            $sql.= " AND t.elementtype = '".$this->db->escape($type)."'";
+        }
         // Add sql filters
         if ($sqlfilters)
         {
@@ -501,8 +512,7 @@ 
         			$list[$tab->elementtype][$tab->name]['list']=$tab->list;
         		}
         	}
-        }
-        else
+        } else
         {
             throw new RestException(503, 'Error when retrieving list of extra fields : '.$this->db->lasterror());
         }
@@ -539,8 +549,12 @@ 
         $sql = "SELECT rowid AS id, zip, town, fk_county, fk_pays AS fk_country";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_ziptown as t";
         $sql.= " WHERE t.active = 1";
-        if ($zipcode) $sql.=" AND t.zip LIKE '%" . $this->db->escape($zipcode) . "%'";
-        if ($town)    $sql.=" AND t.town LIKE '%" . $this->db->escape($town) . "%'";
+        if ($zipcode) {
+            $sql.=" AND t.zip LIKE '%" . $this->db->escape($zipcode) . "%'";
+        }
+        if ($town) {
+            $sql.=" AND t.town LIKE '%" . $this->db->escape($town) . "%'";
+        }
         // Add sql filters
         if ($sqlfilters)
         {
@@ -781,8 +795,12 @@ 
     	$sql = "SELECT rowid, code, pos,  label, use_default, description";
     	$sql.= " FROM ".MAIN_DB_PREFIX."c_ticket_type as t";
     	$sql.= " WHERE t.active = 1";
-    	if ($type) $sql.=" AND t.type LIKE '%" . $this->db->escape($type) . "%'";
-    	if ($module)    $sql.=" AND t.module LIKE '%" . $this->db->escape($module) . "%'";
+    	if ($type) {
+    	    $sql.=" AND t.type LIKE '%" . $this->db->escape($type) . "%'";
+    	}
+    	if ($module) {
+    	    $sql.=" AND t.module LIKE '%" . $this->db->escape($module) . "%'";
+    	}
     	// Add sql filters
     	if ($sqlfilters)
     	{
@@ -858,23 +876,27 @@ 
     	$xmlfile = DOL_DOCUMENT_ROOT.$xmlshortfile;
     	// Remote file to compare to
     	$xmlremote = ($target == 'default' ? '' : $target);
-    	if (empty($xmlremote) && ! empty($conf->global->MAIN_FILECHECK_URL)) $xmlremote = $conf->global->MAIN_FILECHECK_URL;
+    	if (empty($xmlremote) && ! empty($conf->global->MAIN_FILECHECK_URL)) {
+    	    $xmlremote = $conf->global->MAIN_FILECHECK_URL;
+    	}
     	$param='MAIN_FILECHECK_URL_'.DOL_VERSION;
-    	if (empty($xmlremote) && ! empty($conf->global->$param)) $xmlremote = $conf->global->$param;
-    	if (empty($xmlremote)) $xmlremote = 'https://www.dolibarr.org/files/stable/signatures/filelist-'.DOL_VERSION.'.xml';
+    	if (empty($xmlremote) && ! empty($conf->global->$param)) {
+    	    $xmlremote = $conf->global->$param;
+    	}
+    	if (empty($xmlremote)) {
+    	    $xmlremote = 'https://www.dolibarr.org/files/stable/signatures/filelist-'.DOL_VERSION.'.xml';
+    	}
 
     	if ($target == 'local')
     	{
     		if (dol_is_file($xmlfile))
     		{
     			$xml = simplexml_load_file($xmlfile);
-    		}
-    		else
+    		} else
     		{
     			throw new RestException(500, $langs->trans('XmlNotFound') . ': ' . $xmlfile);
     		}
-    	}
-    	else
+    	} else
     	{
     		$xmlarray = getURLContent($xmlremote);
 
@@ -884,8 +906,7 @@ 
     			$xmlfile = $xmlarray['content'];
     			//print "xmlfilestart".$xmlfile."endxmlfile";
     			$xml = simplexml_load_string($xmlfile);
-    		}
-    		else
+    		} else
     		{
     			$errormsg=$langs->trans('XmlNotFound') . ': ' . $xmlremote.' - '.$xmlarray['http_code'].' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg'];
     			throw new RestException(500, $errormsg);
@@ -915,14 +936,18 @@ 
     			$out.='</tr>'."\n";
 
     			$i = 0;
-    			foreach ($xml->dolibarr_constants[0]->constant as $constant)    // $constant is a simpleXMLElement
+    			foreach ($xml->dolibarr_constants[0]->constant as $constant) {
+    			    // $constant is a simpleXMLElement
     			{
     				$constname=$constant['name'];
+    			}
     				$constvalue=(string) $constant;
     				$constvalue = (empty($constvalue)?'0':$constvalue);
     				// Value found
     				$value='';
-    				if ($constname && $conf->global->$constname != '') $value=$conf->global->$constname;
+    				if ($constname && $conf->global->$constname != '') {
+    				    $value=$conf->global->$constname;
+    				}
     				$valueforchecksum=(empty($value)?'0':$value);
 
     				$checksumconcat[]=$valueforchecksum;
@@ -993,8 +1018,7 @@ 
     					$out.='<td align="center">'.$file['expectedmd5'].'</td>' . "\n";
     					$out.="</tr>\n";
     				}
-    			}
-    			else
+    			} else
     			{
     				$out.='<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     			}
@@ -1043,8 +1067,7 @@ 
     				$out.='<td align="right">'.dol_print_size($totalsize).'</td>' . "\n";
     				$out.='<td align="right"></td>' . "\n";
     				$out.="</tr>\n";
-    			}
-    			else
+    			} else
     			{
     				$out.='<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     			}
@@ -1093,8 +1116,7 @@ 
     				$out.='<td align="right">'.dol_print_size($totalsize).'</td>' . "\n";
     				$out.='<td align="right"></td>' . "\n";
     				$out.="</tr>\n";
-    			}
-    			else
+    			} else
     			{
     				$out.='<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     			}
@@ -1106,13 +1128,11 @@ 
     			if (empty($tmpfilelist) && empty($tmpfilelist2) && empty($tmpfilelist3))
     			{
     				//setEventMessages($langs->trans("FileIntegrityIsStrictlyConformedWithReference"), null, 'mesgs');
-    			}
-    			else
+    			} else
     			{
     				//setEventMessages($langs->trans("FileIntegritySomeFilesWereRemovedOrModified"), null, 'warnings');
     			}
-    		}
-    		else
+    		} else
     		{
     			throw new RestException(500, 'Error: Failed to found dolibarr_htdocs_dir into XML file '.$xmlfile);
     		}
@@ -1135,24 +1155,21 @@ 
     				$resultcomment='FileIntegrityIsOkButFilesWereAdded';
     				//$outcurrentchecksum =  $checksumget.' - <span class="'.$resultcode.'">'.$langs->trans("FileIntegrityIsOkButFilesWereAdded").'</span>';
     				$outcurrentchecksum =  $checksumget;
-    			}
-    			else
+    			} else
     			{
     				$resultcode = 'ok';
     				$resultcomment='Success';
     				//$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
     				$outcurrentchecksum =  $checksumget;
     			}
-    		}
-    		else
+    		} else
     		{
     			$resultcode = 'error';
     			$resultcomment='Error';
     			//$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
     			$outcurrentchecksum =  $checksumget;
     		}
-    	}
-    	else {
+    	} else {
     		throw new RestException(404, 'No signature file known');
     	}
 

dolibarr/htdocs/api/class/api_documents.class.php

Braces +28 added lines, -37 removed lines

@@ -181,8 +181,7 @@ 
 			if( $result <= 0 ) {
 				throw new RestException(500, 'Error generating document');
 			}
-		}
-		elseif ($module_part == 'commande' || $module_part == 'order')
+		} elseif ($module_part == 'commande' || $module_part == 'order')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 			$this->order = new Commande($this->db);
@@ -195,8 +194,7 @@ 
 			if( $result <= 0 ) {
 				throw new RestException(500, 'Error generating document');
 			}
-		}
-		elseif ($module_part == 'propal' || $module_part == 'proposal')
+		} elseif ($module_part == 'propal' || $module_part == 'proposal')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 			$this->propal = new Propal($this->db);
@@ -209,8 +207,7 @@ 
 			if( $result <= 0 ) {
 				throw new RestException(500, 'Error generating document');
 			}
-		}
-		else
+		} else
 		{
 			throw new RestException(403, 'Generation not available for this modulepart');
 		}
@@ -274,8 +271,7 @@ 
 			}
 
 			$upload_dir = $conf->societe->multidir_output[$object->entity] . "/" . $object->id;
-		}
-		else if ($modulepart == 'adherent' || $modulepart == 'member')
+		} else if ($modulepart == 'adherent' || $modulepart == 'member')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 
@@ -290,8 +286,7 @@ 
 			}
 
 			$upload_dir = $conf->adherent->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'member');
-		}
-		else if ($modulepart == 'propal' || $modulepart == 'proposal')
+		} else if ($modulepart == 'propal' || $modulepart == 'proposal')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 
@@ -306,8 +301,7 @@ 
 			}
 
 			$upload_dir = $conf->propal->multidir_output[$object->entity] . "/" . get_exdir(0, 0, 0, 1, $object, 'propal');
-		}
-		else if ($modulepart == 'commande' || $modulepart == 'order')
+		} else if ($modulepart == 'commande' || $modulepart == 'order')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 
@@ -322,8 +316,7 @@ 
 			}
 
 			$upload_dir = $conf->commande->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'commande');
-		}
-		else if ($modulepart == 'shipment' || $modulepart == 'expedition')
+		} else if ($modulepart == 'shipment' || $modulepart == 'expedition')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 
@@ -338,8 +331,7 @@ 
 			}
 
 			$upload_dir = $conf->expedition->dir_output . "/sending/" . get_exdir(0, 0, 0, 1, $object, 'shipment');
-		}
-		else if ($modulepart == 'facture' || $modulepart == 'invoice')
+		} else if ($modulepart == 'facture' || $modulepart == 'invoice')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
@@ -354,8 +346,7 @@ 
 			}
 
 			$upload_dir = $conf->facture->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'invoice');
-		}
-		else if ($modulepart == 'agenda' || $modulepart == 'action' || $modulepart == 'event')
+		} else if ($modulepart == 'agenda' || $modulepart == 'action' || $modulepart == 'event')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
@@ -370,8 +361,7 @@ 
 			}
 
 			$upload_dir = $conf->agenda->dir_output.'/'.dol_sanitizeFileName($object->ref);
-		}
-		else
+		} else
 		{
 			throw new RestException(500, 'Modulepart '.$modulepart.' not implemented yet.');
 		}
@@ -440,8 +430,12 @@ 
 		}
 
 		$newfilecontent = '';
-		if (empty($fileencoding)) $newfilecontent = $filecontent;
-		if ($fileencoding == 'base64') $newfilecontent = base64_decode($filecontent);
+		if (empty($fileencoding)) {
+		    $newfilecontent = $filecontent;
+		}
+		if ($fileencoding == 'base64') {
+		    $newfilecontent = base64_decode($filecontent);
+		}
 
 		$original_file = dol_sanitizeFileName($filename);
 
@@ -458,13 +452,11 @@ 
 
 				require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 				$object = new Facture($this->db);
-			}
-			elseif ($modulepart == 'project')
+			} elseif ($modulepart == 'project')
 			{
 				require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 				$object = new Project($this->db);
-			}
-			elseif ($modulepart == 'task' || $modulepart == 'project_task')
+			} elseif ($modulepart == 'task' || $modulepart == 'project_task')
 			{
 				$modulepart = 'project_task';
 
@@ -482,8 +474,7 @@ 
 					{
 						$tmpreldir = dol_sanitizeFileName($object->project->ref).'/';
 					}
-				}
-				else
+				} else
 				{
 					throw new RestException(500, 'Error while fetching Task '.$ref);
 				}
@@ -501,8 +492,7 @@ 
 				if($result == 0)
 				{
 					throw new RestException(404, "Object with ref '".$ref."' was not found.");
-			}
-				elseif ($result < 0)
+			} elseif ($result < 0)
 				{
 					throw new RestException(500, 'Error while fetching object.');
 				}
@@ -522,10 +512,11 @@ 
 			{
 				throw new RestException(500, 'This value of modulepart does not support yet usage of ref. Check modulepart parameter or try to use subdir parameter instead of ref.');
 			}
-		}
-		else
+		} else
 		{
-			if ($modulepart == 'invoice') $modulepart ='facture';
+			if ($modulepart == 'invoice') {
+			    $modulepart ='facture';
+			}
 
 			$relativefile = $subdir;
 
@@ -561,8 +552,7 @@ 
 			$nbofbyteswrote = fwrite($fhandle, $newfilecontent);
 			fclose($fhandle);
 			@chmod($destfiletmp, octdec($conf->global->MAIN_UMASK));
-		}
-		else
+		} else
 		{
 			throw new RestException(500, "Failed to open file '".$destfiletmp."' for write");
 		}
@@ -586,8 +576,9 @@ 
 	function _validate_file($data) {
 		$result = array();
 		foreach (Documents::$DOCUMENT_FIELDS as $field) {
-			if (!isset($data[$field]))
-				throw new RestException(400, "$field field missing");
+			if (!isset($data[$field])) {
+							throw new RestException(400, "$field field missing");
+			}
 			$result[$field] = $data[$field];
 		}
 		return $result;

dolibarr/htdocs/api/admin/index.php

Braces +6 added lines, -9 removed lines

@@ -32,8 +32,9 @@ 
 // Load translation files required by the page
 $langs->load("admin");
 
-if (! $user->admin)
+if (! $user->admin) {
 	accessforbidden();
+}
 
 $action=GETPOST('action','aZ09');
 
@@ -54,8 +55,7 @@ 
 				setEventMessages($langs->trans("ErrorFailedToCreateDir", $conf->api->dir_temp), null, 'errors');
 				$error++;
 			}
-		}
-		else
+		} else
 		{
 			// Delete the cache file otherwise it does not update
 			$result = dol_delete_file($conf->api->dir_temp.'/routes.php');
@@ -71,8 +71,7 @@ 
     		header("Location: ".$_SERVER["PHP_SELF"]);
 	   	    exit;
 	    }
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}
@@ -111,8 +110,7 @@ 
     print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setproductionmode&value='.($i+1).'&status=0">';
     print img_picto($langs->trans("Activated"),'switch_on');
     print '</a></td>';
-}
-else
+} else
 {
     print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setproductionmode&value='.($i+1).'&status=1">';
     print img_picto($langs->trans("Disabled"),'switch_off');
@@ -144,8 +142,7 @@ 
 {
     $url=DOL_MAIN_URL_ROOT.'/api/index.php/explorer';
     print img_picto('','object_globe.png').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
-}
-else
+} else
 {
     print $langs->trans("NotAvailableWithThisDistribution");
 }

dolibarr/htdocs/api/admin/explorer.php

Braces +12 added lines, -4 removed lines

@@ -94,7 +94,9 @@ 
                                        $module='fichinter';
                                }
 
-		if (empty($conf->$module->enabled)) $enabled=false;
+		if (empty($conf->$module->enabled)) {
+		    $enabled=false;
+		}
 
                 if ($enabled)
                 {
@@ -190,8 +192,12 @@ 
 print $langs->trans("ListOfAvailableAPIs").':<br>';
 foreach($listofapis['v1'] as $key => $val)
 {
-    if ($key == 'login') continue;
-    if ($key == 'index') continue;
+    if ($key == 'login') {
+        continue;
+    }
+    if ($key == 'index') {
+        continue;
+    }
 
     if ($key)
     {
@@ -199,7 +205,9 @@ 
         {
             $newclass=$val2['className'];
 
-            if (preg_match('/restler/i', $newclass)) continue;
+            if (preg_match('/restler/i', $newclass)) {
+                continue;
+            }
 
             if ($oldclass != $newclass)
             {

dolibarr/htdocs/api/index.php

Braces +69 added lines, -33 removed lines

@@ -24,21 +24,45 @@ 
  *  \file       htdocs/api/index.php
  */
 
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');		// If there is no need to load and show top and left menu
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');		// If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');       // Do not load ajax.lib.php library
-if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
+if (! defined('NOCSRFCHECK')) {
+    define('NOCSRFCHECK','1');
+}
+// Do not check anti CSRF attack test
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL','1');
+}
+// Do not check anti POST attack test
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+// If there is no need to load and show top and left menu
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML','1');
+}
+// If we don't need to load the html.form.class.php
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
+// Do not load ajax.lib.php library
+if (! defined("NOLOGIN")) {
+    define("NOLOGIN",'1');
+}
+// If this page is public (can be called outside logged session)
 
 
 // Force entity if a value is provided into HTTP header. Otherwise, will use the entity of user of token used.
-if (! empty($_SERVER['HTTP_DOLAPIENTITY'])) define("DOLENTITY", (int) $_SERVER['HTTP_DOLAPIENTITY']);
+if (! empty($_SERVER['HTTP_DOLAPIENTITY'])) {
+    define("DOLENTITY", (int) $_SERVER['HTTP_DOLAPIENTITY']);
+}
 
 
 $res=0;
-if (! $res && file_exists("../main.inc.php")) $res=include '../main.inc.php';
-if (! $res) die("Include of main fails");
+if (! $res && file_exists("../main.inc.php")) {
+    $res=include '../main.inc.php';
+}
+if (! $res) {
+    die("Include of main fails");
+}
 
 require_once DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/AutoLoader.php';
 
@@ -146,7 +170,9 @@ 
 
                     // Defined if module is enabled
                     $enabled=true;
-                    if (empty($conf->$modulenameforenabled->enabled)) $enabled=false;
+                    if (empty($conf->$modulenameforenabled->enabled)) {
+                        $enabled=false;
+                    }
 
                     if ($enabled)
                     {
@@ -160,7 +186,9 @@ 
                         {
                             while (($file_searched = readdir($handle_part))!==false)
                             {
-                                if ($file_searched == 'api_access.class.php') continue;
+                                if ($file_searched == 'api_access.class.php') {
+                                    continue;
+                                }
 
                                 if (is_readable($dir_part.$file_searched) && preg_match("/^api_(.*)\.class\.php$/i",$file_searched,$regapi))
                                 {
@@ -171,13 +199,11 @@ 
                                     {
                                         //dol_syslog("Found API by index.php: classname=".$classname."Api for module ".$dir." into ".$dir_part.$file_searched);
                                         $listofapis[strtolower($classname.'Api')] = $classname.'Api';
-                                    }
-                                    elseif (class_exists($classname))
+                                    } elseif (class_exists($classname))
                                     {
                                         //dol_syslog("Found API by index.php: classname=".$classname." for module ".$dir." into ".$dir_part.$file_searched);
                                         $listofapis[strtolower($classname)] = $classname;
-                                    }
-                                    else
+                                    } else
                                     {
                                         dol_syslog("We found an api_xxx file (".$file_searched.") but class ".$classname." does not exists after loading file", LOG_WARNING);
                                     }
@@ -204,10 +230,12 @@ 
 if (! empty($reg[1]) && ($reg[1] != 'explorer' || ($reg[2] != '/swagger.json' && $reg[2] != '/resources.json' && preg_match('/^\/(swagger|resources)\.json\/(.+)$/', $reg[2], $regbis) && $regbis[2] != 'root')))
 {
     $module = $reg[1];
-    if ($module == 'explorer')  // If we call page to explore details of a service
+    if ($module == 'explorer') {
+        // If we call page to explore details of a service
     {
         $module = $regbis[2];
     }
+    }
 
     $module=strtolower($module);
     $moduledirforclass = getModuleDirForApiClass($module);
@@ -216,19 +244,25 @@ 
     dol_syslog("Load a dedicated API file module=".$module." moduledirforclass=".$moduledirforclass);
 
 	$tmpmodule = $module;
-	if ($tmpmodule != 'api')
-		$tmpmodule = preg_replace('/api$/i', '', $tmpmodule);
+	if ($tmpmodule != 'api') {
+			$tmpmodule = preg_replace('/api$/i', '', $tmpmodule);
+	}
 	$classfile = str_replace('_', '', $tmpmodule);
-	if ($module == 'supplierproposals')
-		$classfile = 'supplier_proposals';
-	if ($module == 'supplierorders')
-		$classfile = 'supplier_orders';
-	if ($module == 'supplierinvoices')
-		$classfile = 'supplier_invoices';
-	if ($module == 'ficheinter')
-		$classfile = 'interventions';
-	if ($module == 'interventions')
-		$classfile = 'interventions';
+	if ($module == 'supplierproposals') {
+			$classfile = 'supplier_proposals';
+	}
+	if ($module == 'supplierorders') {
+			$classfile = 'supplier_orders';
+	}
+	if ($module == 'supplierinvoices') {
+			$classfile = 'supplier_invoices';
+	}
+	if ($module == 'ficheinter') {
+			$classfile = 'interventions';
+	}
+	if ($module == 'interventions') {
+			$classfile = 'interventions';
+	}
 
 	$dir_part_file = dol_buildpath('/' . $moduledirforclass . '/class/api_' . $classfile . '.class.php', 0, 2);
 
@@ -237,17 +271,19 @@ 
 	dol_syslog('Search /' . $moduledirforclass . '/class/api_' . $classfile . '.class.php => dir_part_file=' . $dir_part_file . ' classname=' . $classname);
 
 	$res = false;
-	if ($dir_part_file)
-		$res = include_once $dir_part_file;
+	if ($dir_part_file) {
+			$res = include_once $dir_part_file;
+	}
 	if (! $res) {
 		print 'API not found (failed to include API file)';
 		header('HTTP/1.1 501 API not found (failed to include API file)');
 		exit(0);
 	}
 
-	if (class_exists($classname))
-		$api->r->addAPIClass($classname);
-}
+	if (class_exists($classname)) {
+			$api->r->addAPIClass($classname);
+	}
+	}
 
 // TODO If not found, redirect to explorer
 //var_dump($api->r->apiVersionMap);

dolibarr/htdocs/paypal/lib/paypalfunctions.lib.php

Braces +19 added lines, -8 removed lines

@@ -25,11 +25,13 @@ 
 if (session_id() == "")
 {
     session_start();
-    if (ini_get('register_globals'))    // To solve bug in using $_SESSION
+    if (ini_get('register_globals')) {
+        // To solve bug in using $_SESSION
     {
         foreach ($_SESSION as $key=>$value)
         {
             if (isset($GLOBALS[$key])) unset($GLOBALS[$key]);
+    }
         }
     }
 }
@@ -48,12 +50,13 @@ 
  ' For the sandbox, the URL is       https://www.sandbox.paypal.com/webscr&cmd=_express-checkout&token=
  ' For the live site, the URL is        https://www.paypal.com/webscr&cmd=_express-checkout&token=
  */
-if (! empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox','alpha'))		// We can force sand box with param 'forcesandbox'
+if (! empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox','alpha')) {
+    // We can force sand box with param 'forcesandbox'
 {
     $API_Endpoint = "https://api-3t.sandbox.paypal.com/nvp";
-    $API_Url = "https://www.sandbox.paypal.com/webscr?cmd=_express-checkout&token=";
 }
-else
+    $API_Url = "https://www.sandbox.paypal.com/webscr?cmd=_express-checkout&token=";
+} else
 {
     $API_Endpoint = "https://api-3t.paypal.com/nvp";
     $API_Url = "https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=";
@@ -61,13 +64,21 @@ 
 
 // Clean parameters
 $PAYPAL_API_USER="";
-if (! empty($conf->global->PAYPAL_API_USER)) $PAYPAL_API_USER=$conf->global->PAYPAL_API_USER;
+if (! empty($conf->global->PAYPAL_API_USER)) {
+    $PAYPAL_API_USER=$conf->global->PAYPAL_API_USER;
+}
 $PAYPAL_API_PASSWORD="";
-if (! empty($conf->global->PAYPAL_API_PASSWORD)) $PAYPAL_API_PASSWORD=$conf->global->PAYPAL_API_PASSWORD;
+if (! empty($conf->global->PAYPAL_API_PASSWORD)) {
+    $PAYPAL_API_PASSWORD=$conf->global->PAYPAL_API_PASSWORD;
+}
 $PAYPAL_API_SIGNATURE="";
-if (! empty($conf->global->PAYPAL_API_SIGNATURE)) $PAYPAL_API_SIGNATURE=$conf->global->PAYPAL_API_SIGNATURE;
+if (! empty($conf->global->PAYPAL_API_SIGNATURE)) {
+    $PAYPAL_API_SIGNATURE=$conf->global->PAYPAL_API_SIGNATURE;
+}
 $PAYPAL_API_SANDBOX="";
-if (! empty($conf->global->PAYPAL_API_SANDBOX)) $PAYPAL_API_SANDBOX=$conf->global->PAYPAL_API_SANDBOX;
+if (! empty($conf->global->PAYPAL_API_SANDBOX)) {
+    $PAYPAL_API_SANDBOX=$conf->global->PAYPAL_API_SANDBOX;
+}
 
 // Proxy
 $PROXY_HOST = $conf->global->MAIN_PROXY_HOST;

dolibarr/htdocs/paypal/lib/paypal.lib.php

Braces +102 added lines, -46 removed lines

@@ -99,24 +99,36 @@ 
 	    $out=DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?amount='.($mode?'<font color="#666666">':'').$amount.($mode?'</font>':'').'&tag='.($mode?'<font color="#666666">':'').$freetag.($mode?'</font>':'');
 	    if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
 	    {
-	    	if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-	    	else $out.='&securekey='.dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+	    	if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) {
+	    	    $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
+	    	} else {
+	    	    $out.='&securekey='.dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+	    	}
 	    }
     }
     if ($type == 'order')
     {
         $out=DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=order&ref='.($mode?'<font color="#666666">':'');
-        if ($mode == 1) $out.='order_ref';
-        if ($mode == 0) $out.=urlencode($ref);
+        if ($mode == 1) {
+            $out.='order_ref';
+        }
+        if ($mode == 0) {
+            $out.=urlencode($ref);
+        }
 	    $out.=($mode?'</font>':'');
         if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
         {
-    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-            else
+    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) {
+    	        $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
+    	    } else
             {
                 $out.='&securekey='.($mode?'<font color="#666666">':'');
-                if ($mode == 1) $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + order_ref)";
-                if ($mode == 0) $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $type . $ref, 2);
+                if ($mode == 1) {
+                    $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + order_ref)";
+                }
+                if ($mode == 0) {
+                    $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $type . $ref, 2);
+                }
                 $out.=($mode?'</font>':'');
             }
         }
@@ -124,17 +136,26 @@ 
     if ($type == 'invoice')
     {
         $out=DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=invoice&ref='.($mode?'<font color="#666666">':'');
-        if ($mode == 1) $out.='invoice_ref';
-        if ($mode == 0) $out.=urlencode($ref);
+        if ($mode == 1) {
+            $out.='invoice_ref';
+        }
+        if ($mode == 0) {
+            $out.=urlencode($ref);
+        }
 	    $out.=($mode?'</font>':'');
         if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
         {
-    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-            else
+    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) {
+    	        $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
+    	    } else
             {
                 $out.='&securekey='.($mode?'<font color="#666666">':'');
-                if ($mode == 1) $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
-                if ($mode == 0) $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $type . $ref, 2);
+                if ($mode == 1) {
+                    $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
+                }
+                if ($mode == 0) {
+                    $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $type . $ref, 2);
+                }
                 $out.=($mode?'</font>':'');
             }
         }
@@ -142,17 +163,26 @@ 
     if ($type == 'contractline')
     {
         $out=DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=contractline&ref='.($mode?'<font color="#666666">':'');
-        if ($mode == 1) $out.='contractline_ref';
-        if ($mode == 0) $out.=urlencode($ref);
+        if ($mode == 1) {
+            $out.='contractline_ref';
+        }
+        if ($mode == 0) {
+            $out.=urlencode($ref);
+        }
 	    $out.=($mode?'</font>':'');
         if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
         {
-    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-            else
+    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) {
+    	        $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
+    	    } else
             {
                 $out.='&securekey='.($mode?'<font color="#666666">':'');
-                if ($mode == 1) $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
-                if ($mode == 0) $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $type . $ref, 2);
+                if ($mode == 1) {
+                    $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
+                }
+                if ($mode == 0) {
+                    $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $type . $ref, 2);
+                }
                 $out.=($mode?'</font>':'');
             }
         }
@@ -160,17 +190,26 @@ 
     if ($type == 'membersubscription')
     {
         $out=DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=membersubscription&ref='.($mode?'<font color="#666666">':'');
-        if ($mode == 1) $out.='member_ref';
-        if ($mode == 0) $out.=urlencode($ref);
+        if ($mode == 1) {
+            $out.='member_ref';
+        }
+        if ($mode == 0) {
+            $out.=urlencode($ref);
+        }
 	    $out.=($mode?'</font>':'');
         if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
         {
-    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-            else
+    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) {
+    	        $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
+    	    } else
             {
                 $out.='&securekey='.($mode?'<font color="#666666">':'');
-                if ($mode == 1) $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + member_ref)";
-                if ($mode == 0) $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $type . $ref, 2);
+                if ($mode == 1) {
+                    $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + member_ref)";
+                }
+                if ($mode == 0) {
+                    $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $type . $ref, 2);
+                }
                 $out.=($mode?'</font>':'');
             }
         }
@@ -209,7 +248,9 @@ 
     //'
     //'-------------------------------------------------
 
-    if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) $conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY='integral';
+    if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) {
+        $conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY='integral';
+    }
 
     $solutionType='Sole';
     $landingPage='Billing';
@@ -263,8 +304,7 @@ 
         $payPalURL = $API_Url . $token;
         header("Location: ".$payPalURL);
         exit;
-    }
-    else
+    } else
     {
         //Display a user friendly Error on the page using any of the following error information returned by PayPal
         $ErrorCode = urldecode($resArray["L_ERRORCODE0"]);
@@ -275,8 +315,7 @@ 
         if ($ErrorCode == 10729)
         {
         	$mesg.= "PayPal can't accept payments for this thirdparty. An address is defined but is not complete (missing State).<br>Ask system administrator to fix address or to setup Paypal module to accept payments even on not complete addresses (remove option PAYPAL_REQUIRE_VALID_SHIPPING_ADDRESS).<br>\n";
-        }
-        else
+        } else
         {
         	$mesg = $langs->trans('SetExpressCheckoutAPICallFailed') . "<br>\n";
         	$mesg.= $langs->trans('DetailedErrorMessage') . ": " . $ErrorLongMsg."<br>\n";
@@ -351,8 +390,7 @@ 
     if (empty($conf->global->PAYPAL_REQUIRE_VALID_SHIPPING_ADDRESS))
     {
     	$nvpstr = $nvpstr . "&NOSHIPPING=1";	// An empty or not complete shipping address will be accepted
-    }
-    else
+    } else
     {
     	$nvpstr = $nvpstr . "&NOSHIPPING=0";	// A valid shipping address is required (full required fields mandatory)
     }
@@ -365,7 +403,9 @@ 
 
     $paypalprefix = 'PAYMENTREQUEST_0_';
     //$paypalprefix = '';
-	if (! empty($paypalprefix) && $paymentType == 'Sole') $paymentType='Sale';
+	if (! empty($paypalprefix) && $paymentType == 'Sole') {
+	    $paymentType='Sale';
+	}
 
 	$nvpstr = $nvpstr . "&AMT=". urlencode($paymentAmount);									// Total for all elements
 
@@ -388,8 +428,14 @@ 
     $nvpstr = $nvpstr . "&".$paypalprefix."SHIPTOCOUNTRYCODE=" . urlencode($shipToCountryCode);
     $nvpstr = $nvpstr . "&".$paypalprefix."SHIPTOZIP=" . urlencode($shipToZip);
     $nvpstr = $nvpstr . "&".$paypalprefix."PHONENUM=" . urlencode($phoneNum);
-    if (! empty($email)) $nvpstr = $nvpstr . "&".$paypalprefix."EMAIL=" . urlencode($email);      // EMAIL deprecated by paypal -> PAYMENTREQUEST_n_EMAIL
-    if (! empty($desc))  $nvpstr = $nvpstr . "&".$paypalprefix."DESC=" . urlencode($desc);        // DESC deprecated by paypal -> PAYMENTREQUEST_n_DESC
+    if (! empty($email)) {
+        $nvpstr = $nvpstr . "&".$paypalprefix."EMAIL=" . urlencode($email);
+    }
+    // EMAIL deprecated by paypal -> PAYMENTREQUEST_n_EMAIL
+    if (! empty($desc)) {
+        $nvpstr = $nvpstr . "&".$paypalprefix."DESC=" . urlencode($desc);
+    }
+    // DESC deprecated by paypal -> PAYMENTREQUEST_n_DESC
 
     if (! empty($conf->global->PAYPAL_LOGOIMG) && $mysoc->logo)
     {
@@ -592,12 +638,13 @@ 
 
     // TODO problem with triggers
     $API_version="98.0";
-	if (! empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox','alpha'))		// We can force sand box with param 'forcesandbox'
+	if (! empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox','alpha')) {
+	    // We can force sand box with param 'forcesandbox'
 	{
 	    $API_Endpoint = "https://api-3t.sandbox.paypal.com/nvp";
-	    $API_Url = "https://www.sandbox.paypal.com/webscr?cmd=_express-checkout&token=";
 	}
-	else
+	    $API_Url = "https://www.sandbox.paypal.com/webscr?cmd=_express-checkout&token=";
+	} else
 	{
 	    $API_Endpoint = "https://api-3t.paypal.com/nvp";
 	    $API_Url = "https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=";
@@ -605,13 +652,21 @@ 
 
 	// Clean parameters
 	$PAYPAL_API_USER="";
-	if (! empty($conf->global->PAYPAL_API_USER)) $PAYPAL_API_USER=$conf->global->PAYPAL_API_USER;
+	if (! empty($conf->global->PAYPAL_API_USER)) {
+	    $PAYPAL_API_USER=$conf->global->PAYPAL_API_USER;
+	}
 	$PAYPAL_API_PASSWORD="";
-	if (! empty($conf->global->PAYPAL_API_PASSWORD)) $PAYPAL_API_PASSWORD=$conf->global->PAYPAL_API_PASSWORD;
+	if (! empty($conf->global->PAYPAL_API_PASSWORD)) {
+	    $PAYPAL_API_PASSWORD=$conf->global->PAYPAL_API_PASSWORD;
+	}
 	$PAYPAL_API_SIGNATURE="";
-	if (! empty($conf->global->PAYPAL_API_SIGNATURE)) $PAYPAL_API_SIGNATURE=$conf->global->PAYPAL_API_SIGNATURE;
+	if (! empty($conf->global->PAYPAL_API_SIGNATURE)) {
+	    $PAYPAL_API_SIGNATURE=$conf->global->PAYPAL_API_SIGNATURE;
+	}
 	$PAYPAL_API_SANDBOX="";
-	if (! empty($conf->global->PAYPAL_API_SANDBOX)) $PAYPAL_API_SANDBOX=$conf->global->PAYPAL_API_SANDBOX;
+	if (! empty($conf->global->PAYPAL_API_SANDBOX)) {
+	    $PAYPAL_API_SANDBOX=$conf->global->PAYPAL_API_SANDBOX;
+	}
 	// TODO END problem with triggers
 
     dol_syslog("Paypal API endpoint ".$API_Endpoint);
@@ -644,7 +699,9 @@ 
         dol_syslog("Paypal API hash_call set proxy to ".$PROXY_HOST. ":" . $PROXY_PORT." - ".$PROXY_USER. ":" . $PROXY_PASS);
         //curl_setopt ($ch, CURLOPT_PROXYTYPE, CURLPROXY_HTTP); // Curl 7.10
         curl_setopt($ch, CURLOPT_PROXY, $PROXY_HOST. ":" . $PROXY_PORT);
-        if ($PROXY_USER) curl_setopt($ch, CURLOPT_PROXYUSERPWD, $PROXY_USER. ":" . $PROXY_PASS);
+        if ($PROXY_USER) {
+            curl_setopt($ch, CURLOPT_PROXYUSERPWD, $PROXY_USER. ":" . $PROXY_PASS);
+        }
     }
 
     //NVPRequest for submitting to server
@@ -676,8 +733,7 @@ 
         $_SESSION['curl_error_msg']=curl_error($ch);
 
         //Execute the Error handling module to display errors.
-    }
-    else
+    } else
     {
         //closing the curl
         curl_close($ch);

dolibarr/htdocs/paypal/admin/paypal.php

Braces +58 added lines, -25 removed lines

@@ -35,7 +35,9 @@ 
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'other', 'paypal', 'paybox'));
 
-if (! $user->admin) accessforbidden();
+if (! $user->admin) {
+    accessforbidden();
+}
 
 $action = GETPOST('action','alpha');
 
@@ -44,43 +46,72 @@ 
 	$db->begin();
 
     $result=dolibarr_set_const($db, "PAYPAL_API_USER",GETPOST('PAYPAL_API_USER','alpha'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
+    if (! $result > 0) {
+        $error++;
+    }
     $result=dolibarr_set_const($db, "PAYPAL_API_PASSWORD",GETPOST('PAYPAL_API_PASSWORD','alpha'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
+    if (! $result > 0) {
+        $error++;
+    }
     $result=dolibarr_set_const($db, "PAYPAL_API_SIGNATURE",GETPOST('PAYPAL_API_SIGNATURE','alpha'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
+    if (! $result > 0) {
+        $error++;
+    }
     $result=dolibarr_set_const($db, "PAYPAL_SSLVERSION",GETPOST('PAYPAL_SSLVERSION','alpha'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
+    if (! $result > 0) {
+        $error++;
+    }
     $result=dolibarr_set_const($db, "ONLINE_PAYMENT_CREDITOR",GETPOST('ONLINE_PAYMENT_CREDITOR','alpha'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
+    if (! $result > 0) {
+        $error++;
+    }
     $result=dolibarr_set_const($db, "PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS",GETPOST('PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS','int'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
+    if (! $result > 0) {
+        $error++;
+    }
     $result=dolibarr_set_const($db, "PAYPAL_API_INTEGRAL_OR_PAYPALONLY",GETPOST('PAYPAL_API_INTEGRAL_OR_PAYPALONLY','alpha'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
+    if (! $result > 0) {
+        $error++;
+    }
     $result=dolibarr_set_const($db, "ONLINE_PAYMENT_CSS_URL",GETPOST('ONLINE_PAYMENT_CSS_URL','alpha'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
+    if (! $result > 0) {
+        $error++;
+    }
     $result=dolibarr_set_const($db, "PAYPAL_ADD_PAYMENT_URL",GETPOST('PAYPAL_ADD_PAYMENT_URL','alpha'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
+    if (! $result > 0) {
+        $error++;
+    }
     $result=dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_FORM",GETPOST('ONLINE_PAYMENT_MESSAGE_FORM'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
+    if (! $result > 0) {
+        $error++;
+    }
     $result=dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_OK",GETPOST('ONLINE_PAYMENT_MESSAGE_OK'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
+    if (! $result > 0) {
+        $error++;
+    }
     $result=dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_KO",GETPOST('ONLINE_PAYMENT_MESSAGE_KO'),'chaine',0,'',$conf->entity);
-	if (! $result > 0) $error++;
+	if (! $result > 0) {
+	    $error++;
+	}
 	$result=dolibarr_set_const($db, "ONLINE_PAYMENT_SENDEMAIL",GETPOST('ONLINE_PAYMENT_SENDEMAIL'),'chaine',0,'',$conf->entity);
-	if (! $result > 0) $error++;
+	if (! $result > 0) {
+	    $error++;
+	}
 	// Payment token for URL
 	$result=dolibarr_set_const($db, "PAYMENT_SECURITY_TOKEN",GETPOST('PAYMENT_SECURITY_TOKEN','alpha'),'chaine',0,'',$conf->entity);
-	if (! $result > 0) $error++;
+	if (! $result > 0) {
+	    $error++;
+	}
 	$result=dolibarr_set_const($db, "PAYMENT_SECURITY_TOKEN_UNIQUE",GETPOST('PAYMENT_SECURITY_TOKEN_UNIQUE','alpha'),'chaine',0,'',$conf->entity);
-	if (! $result > 0) $error++;
+	if (! $result > 0) {
+	    $error++;
+	}
 
 	if (! $error)
   	{
   		$db->commit();
   		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-  	}
-  	else
+  	} else
   	{
   		$db->rollback();
 		dol_print_error($db);
@@ -91,12 +122,13 @@ 
 {
     $liveenable = GETPOST('value','int')?0:1;
     $res = dolibarr_set_const($db, "PAYPAL_API_SANDBOX", $liveenable,'yesno',0,'',$conf->entity);
-    if (! $res > 0) $error++;
+    if (! $res > 0) {
+        $error++;
+    }
     if (! $error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
+    } else
     {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
@@ -151,8 +183,7 @@ 
 {
     print '<a href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=0">';
     print img_picto($langs->trans("Activated"),'switch_on');
-}
-else
+} else
 {
     print '<a href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=1">';
     print img_picto($langs->trans("Disabled"),'switch_off');
@@ -267,8 +298,9 @@ 
 print '<tr class="oddeven"><td>';
 print $langs->trans("SecurityToken").'</td><td>';
 print '<input size="48" type="text" id="PAYMENT_SECURITY_TOKEN" name="PAYMENT_SECURITY_TOKEN" value="'.$conf->global->PAYMENT_SECURITY_TOKEN.'">';
-if (! empty($conf->use_javascript_ajax))
+if (! empty($conf->use_javascript_ajax)) {
 	print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
+}
 	print '</td></tr>';
 
 	print '<tr class="oddeven"><td>';
@@ -288,8 +320,9 @@ 
 
 // Help doc
 print '<u>'.$langs->trans("InformationToFindParameters","Paypal").'</u>:<br>';
-if (! empty($conf->use_javascript_ajax))
+if (! empty($conf->use_javascript_ajax)) {
 	print '<a href="#" class="reposition" id="apidoca">'.$langs->trans("ClickHere").'...</a>';
+}
 
 $realpaypalurl='www.paypal.com';
 $sandboxpaypalurl='developer.paypal.com';

dolibarr/htdocs/ftp/admin/ftpclient.php

Braces +44 added lines, -23 removed lines

@@ -28,7 +28,9 @@ 
 $langs->loadLangs(array("admin", "ftp"));
 
 // Security check
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+    accessforbidden();
+}
 
 $def = array();
 $lastftpentry=0;
@@ -49,9 +51,10 @@ 
 {
     $obj = $db->fetch_object($result);
     preg_match('/([0-9]+)$/i',$obj->name,$reg);
-	if ($reg[1]) $lastftpentry = $reg[1];
-}
-else
+	if ($reg[1]) {
+	    $lastftpentry = $reg[1];
+	}
+	} else
 {
     dol_print_error($db);
 }
@@ -85,19 +88,28 @@ 
         $db->begin();
 
 		$result1=dolibarr_set_const($db, "FTP_PORT_" . $entry,GETPOST($ftp_port,'alpha'),'chaine',0,'',$conf->entity);
-		if ($result1) $result2=dolibarr_set_const($db, "FTP_SERVER_" . $entry, GETPOST($ftp_server,'alpha'),'chaine',0,'',$conf->entity);
-		if ($result2) $result3=dolibarr_set_const($db, "FTP_USER_" . $entry,GETPOST($ftp_user,'alpha'),'chaine',0,'',$conf->entity);
-		if ($result3) $result4=dolibarr_set_const($db, "FTP_PASSWORD_" . $entry,GETPOST($ftp_password,'alpha'),'chaine',0,'',$conf->entity);
-		if ($result4) $result5=dolibarr_set_const($db, "FTP_NAME_" . $entry,GETPOST($ftp_name,'alpha'),'chaine',0,'',$conf->entity);
-		if ($result5) $result6=dolibarr_set_const($db, "FTP_PASSIVE_" . $entry,GETPOST($ftp_passive,'alpha'),'chaine',0,'',$conf->entity);
+		if ($result1) {
+		    $result2=dolibarr_set_const($db, "FTP_SERVER_" . $entry, GETPOST($ftp_server,'alpha'),'chaine',0,'',$conf->entity);
+		}
+		if ($result2) {
+		    $result3=dolibarr_set_const($db, "FTP_USER_" . $entry,GETPOST($ftp_user,'alpha'),'chaine',0,'',$conf->entity);
+		}
+		if ($result3) {
+		    $result4=dolibarr_set_const($db, "FTP_PASSWORD_" . $entry,GETPOST($ftp_password,'alpha'),'chaine',0,'',$conf->entity);
+		}
+		if ($result4) {
+		    $result5=dolibarr_set_const($db, "FTP_NAME_" . $entry,GETPOST($ftp_name,'alpha'),'chaine',0,'',$conf->entity);
+		}
+		if ($result5) {
+		    $result6=dolibarr_set_const($db, "FTP_PASSIVE_" . $entry,GETPOST($ftp_passive,'alpha'),'chaine',0,'',$conf->entity);
+		}
 
         if ($result1 && $result2 && $result3 && $result4 && $result5 && $result6)
         {
             $db->commit();
             header("Location: ".$_SERVER["PHP_SELF"]);
             exit;
-        }
-        else
+        } else
         {
             $db->rollback();
             dol_print_error($db);
@@ -112,19 +124,28 @@ 
         $db->begin();
 
 		$result1=dolibarr_del_const($db,"FTP_PORT_" . $entry,$conf->entity);
-		if ($result1) $result2=dolibarr_del_const($db,"FTP_SERVER_" . $entry,$conf->entity);
-		if ($result2) $result3=dolibarr_del_const($db,"FTP_USER_" . $entry,$conf->entity);
-		if ($result3) $result4=dolibarr_del_const($db,"FTP_PASSWORD_" . $entry,$conf->entity);
-		if ($result4) $result5=dolibarr_del_const($db,"FTP_NAME_" . $entry,$conf->entity);
-		if ($result4) $result6=dolibarr_del_const($db,"FTP_PASSIVE_" . $entry,$conf->entity);
+		if ($result1) {
+		    $result2=dolibarr_del_const($db,"FTP_SERVER_" . $entry,$conf->entity);
+		}
+		if ($result2) {
+		    $result3=dolibarr_del_const($db,"FTP_USER_" . $entry,$conf->entity);
+		}
+		if ($result3) {
+		    $result4=dolibarr_del_const($db,"FTP_PASSWORD_" . $entry,$conf->entity);
+		}
+		if ($result4) {
+		    $result5=dolibarr_del_const($db,"FTP_NAME_" . $entry,$conf->entity);
+		}
+		if ($result4) {
+		    $result6=dolibarr_del_const($db,"FTP_PASSIVE_" . $entry,$conf->entity);
+		}
 		
         if ($result1 && $result2 && $result3 && $result4 && $result5 && $result6)
         {
             $db->commit();
             header("Location: ".$_SERVER["PHP_SELF"]);
             exit;
-        }
-        else
+        } else
         {
             $db->rollback();
             dol_print_error($db);
@@ -148,8 +169,7 @@ 
 if (! function_exists('ftp_connect'))
 {
 	print $langs->trans("FTPFeatureNotSupportedByYourPHP");
-}
-else
+} else
 {
 
 	// Formulaire ajout
@@ -195,7 +215,9 @@ 
 	print '<tr class="impair">';
 	print '<td>'.$langs->trans("FTPPassiveMode").'</td>';
 	$defaultpassive=GETPOST("FTP_PASSIVE_" . ($lastftpentry+1));
-	if (! isset($_POST["FTP_PASSIVE_" . ($lastftpentry+1)])) $defaultpassive=empty($conf->global->FTP_SUGGEST_PASSIVE_BYDEFAULT)?0:1;
+	if (! isset($_POST["FTP_PASSIVE_" . ($lastftpentry+1)])) {
+	    $defaultpassive=empty($conf->global->FTP_SUGGEST_PASSIVE_BYDEFAULT)?0:1;
+	}
 	print '<td>'.$form->selectyesno('FTP_PASSIVE_'.($lastftpentry+1), $defaultpassive, 2).'</td>';
 	print '<td>'.$langs->trans("No").'</td>';
 	print '</tr>';
@@ -301,8 +323,7 @@ 
 			
 			$i++;
 		}
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}