alxarafe / alixar

dolibarr/htdocs/core/lib/modulebuilder.lib.php

Spacing +82 added lines, -82 removed lines

@@ -37,14 +37,14 @@ 
  * 	@return	int|object					<=0 if KO, Object if OK
  *  @see rebuildObjectSql
  */
-function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir='', $addfieldentry=array() ,$delfieldentry='')
+function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir = '', $addfieldentry = array(), $delfieldentry = '')
 {
     global $db, $langs;
 
     if (empty($objectname)) return -1;
-    if (empty($readdir)) $readdir=$destdir;
+    if (empty($readdir)) $readdir = $destdir;
 
-    if (! empty($addfieldentry['arrayofkeyval']) && ! is_array($addfieldentry['arrayofkeyval']))
+    if (!empty($addfieldentry['arrayofkeyval']) && !is_array($addfieldentry['arrayofkeyval']))
     {
     	dol_print_error('', 'Bad parameter addfieldentry with a property arrayofkeyval defined but that is not an array.');
     	return -1;
@@ -64,7 +64,7 @@ 
     		return -2;
     	}
 
-    	if (! preg_match('/^(price|boolean|sellist|integer|date|timestamp|varchar|double|text|html)/', $addfieldentry['type']))
+    	if (!preg_match('/^(price|boolean|sellist|integer|date|timestamp|varchar|double|text|html)/', $addfieldentry['type']))
 
     	{
     		setEventMessages($langs->trans('BadFormatForType', $objectname), null, 'errors');
@@ -72,9 +72,9 @@ 
     	}
     }
 
-    $pathoffiletoeditsrc=$readdir.'/class/'.strtolower($objectname).'.class.php';
-    $pathoffiletoedittarget=$destdir.'/class/'.strtolower($objectname).'.class.php'.($readdir != $destdir ? '.new' : '');
-    if (! dol_is_file($pathoffiletoeditsrc))
+    $pathoffiletoeditsrc = $readdir.'/class/'.strtolower($objectname).'.class.php';
+    $pathoffiletoedittarget = $destdir.'/class/'.strtolower($objectname).'.class.php'.($readdir != $destdir ? '.new' : '');
+    if (!dol_is_file($pathoffiletoeditsrc))
     {
     	$langs->load("errors");
         setEventMessages($langs->trans("ErrorFileNotFound", $pathoffiletoeditsrc), null, 'errors');
@@ -87,7 +87,7 @@ 
     try
     {
         include_once $pathoffiletoeditsrc;
-        if (class_exists($objectname)) $object=new $objectname($db);
+        if (class_exists($objectname)) $object = new $objectname($db);
         else return -4;
 
         // Backup old file
@@ -101,83 +101,83 @@ 
         {
         	if (is_array($addfieldentry) && count($addfieldentry))
         	{
-				$name=$addfieldentry['name'];
+				$name = $addfieldentry['name'];
         		unset($addfieldentry['name']);
 
-        		$object->fields[$name]=$addfieldentry;
+        		$object->fields[$name] = $addfieldentry;
         	}
-        	if (! empty($delfieldentry))
+        	if (!empty($delfieldentry))
         	{
-        		$name=$delfieldentry;
+        		$name = $delfieldentry;
         		unset($object->fields[$name]);
         	}
         }
 
         dol_sort_array($object->fields, 'position');
 
-        $i=0;
+        $i = 0;
         $texttoinsert = '// BEGIN MODULEBUILDER PROPERTIES'."\n";
-        $texttoinsert.= "\t".'/**'."\n";
-        $texttoinsert.= "\t".' * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.'."\n";
-        $texttoinsert.= "\t".' */'."\n";
-        $texttoinsert.= "\t".'public $fields=array('."\n";
+        $texttoinsert .= "\t".'/**'."\n";
+        $texttoinsert .= "\t".' * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.'."\n";
+        $texttoinsert .= "\t".' */'."\n";
+        $texttoinsert .= "\t".'public $fields=array('."\n";
 
         if (count($object->fields))
         {
 
-            foreach($object->fields as $key => $val)
+            foreach ($object->fields as $key => $val)
             {
                 $i++;
-                $texttoinsert.= "\t\t'".$key."' => array('type'=>'".$val['type']."', 'label'=>'".$val['label']."',";
-                $texttoinsert.= " 'enabled'=>".($val['enabled']!=''?$val['enabled']:1).",";
-                $texttoinsert.= " 'visible'=>".($val['visible']!=''?$val['visible']:-1).",";
-                $texttoinsert.= " 'position'=>".($val['position']!=''?$val['position']:50).",";
-                $texttoinsert.= " 'notnull'=>".($val['notnull']!=''?$val['notnull']:-1).",";
-                if ($val['default'])        $texttoinsert.= " 'default'=>'".$val['default']."',";
-                if ($val['index'])          $texttoinsert.= " 'index'=>".$val['index'].",";
-                if ($val['searchall'])      $texttoinsert.= " 'searchall'=>".$val['searchall'].",";
-                if ($val['isameasure'])     $texttoinsert.= " 'isameasure'=>'".$val['isameasure']."',";
-                if ($val['foreignkey'])     $texttoinsert.= " 'foreignkey'=>'".$val['foreignkey']."',";
-                if ($val['help'])           $texttoinsert.= " 'help'=>\"".preg_replace('/"/', '', $val['help'])."\",";
-                if ($val['comment'])        $texttoinsert.= " 'comment'=>\"".preg_replace('/"/', '', $val['comment'])."\",";
-                if ($val['showoncombobox']) $texttoinsert.= " 'showoncombobox'=>'".$val['showoncombobox']."',";
+                $texttoinsert .= "\t\t'".$key."' => array('type'=>'".$val['type']."', 'label'=>'".$val['label']."',";
+                $texttoinsert .= " 'enabled'=>".($val['enabled'] != '' ? $val['enabled'] : 1).",";
+                $texttoinsert .= " 'visible'=>".($val['visible'] != '' ? $val['visible'] : -1).",";
+                $texttoinsert .= " 'position'=>".($val['position'] != '' ? $val['position'] : 50).",";
+                $texttoinsert .= " 'notnull'=>".($val['notnull'] != '' ? $val['notnull'] : -1).",";
+                if ($val['default'])        $texttoinsert .= " 'default'=>'".$val['default']."',";
+                if ($val['index'])          $texttoinsert .= " 'index'=>".$val['index'].",";
+                if ($val['searchall'])      $texttoinsert .= " 'searchall'=>".$val['searchall'].",";
+                if ($val['isameasure'])     $texttoinsert .= " 'isameasure'=>'".$val['isameasure']."',";
+                if ($val['foreignkey'])     $texttoinsert .= " 'foreignkey'=>'".$val['foreignkey']."',";
+                if ($val['help'])           $texttoinsert .= " 'help'=>\"".preg_replace('/"/', '', $val['help'])."\",";
+                if ($val['comment'])        $texttoinsert .= " 'comment'=>\"".preg_replace('/"/', '', $val['comment'])."\",";
+                if ($val['showoncombobox']) $texttoinsert .= " 'showoncombobox'=>'".$val['showoncombobox']."',";
                 if ($val['arrayofkeyval'])
                 {
-                	$texttoinsert.= " 'arrayofkeyval'=>array(";
-                	$i=0;
-                	foreach($val['arrayofkeyval'] as $key2 => $val2)
+                	$texttoinsert .= " 'arrayofkeyval'=>array(";
+                	$i = 0;
+                	foreach ($val['arrayofkeyval'] as $key2 => $val2)
                 	{
-                		if ($i) $texttoinsert.=", ";
-                		$texttoinsert.="'".$key2."'=>'".$val2."'";
+                		if ($i) $texttoinsert .= ", ";
+                		$texttoinsert .= "'".$key2."'=>'".$val2."'";
                 		$i++;
                 	}
-                	$texttoinsert.= ")";
+                	$texttoinsert .= ")";
                 }
-                $texttoinsert.= "),\n";
+                $texttoinsert .= "),\n";
             }
         }
 
-        $texttoinsert.= "\t".');'."\n";
+        $texttoinsert .= "\t".');'."\n";
 		//print ($texttoinsert);exit;
 
         if (count($object->fields))
         {
-        	$typetotypephp=array('integer'=>'integer', 'varchar'=>'string');
+        	$typetotypephp = array('integer'=>'integer', 'varchar'=>'string');
 
-        	foreach($object->fields as $key => $val)
+        	foreach ($object->fields as $key => $val)
             {
                 $i++;
                 //$typephp=$typetotypephp[$val['type']];
-                $texttoinsert.= "\t".'public $'.$key.";";
+                $texttoinsert .= "\t".'public $'.$key.";";
                 //if ($key == 'rowid')  $texttoinsert.= ' AUTO_INCREMENT PRIMARY KEY';
                 //if ($key == 'entity') $texttoinsert.= ' DEFAULT 1';
                 //$texttoinsert.= ($val['notnull']?' NOT NULL':'');
                 //if ($i < count($object->fields)) $texttoinsert.=";";
-                $texttoinsert.= "\n";
+                $texttoinsert .= "\n";
             }
         }
 
-        $texttoinsert.= "\t".'// END MODULEBUILDER PROPERTIES';
+        $texttoinsert .= "\t".'// END MODULEBUILDER PROPERTIES';
 
         //print($texttoinsert);exit;
 
@@ -191,7 +191,7 @@ 
 
         return $object;
     }
-    catch(Exception $e)
+    catch (Exception $e)
     {
         print $e->getMessage();
         return -5;
@@ -210,21 +210,21 @@ 
  * 	@return	int							<=0 if KO, >0 if OK
  *  @see rebuildObjectClass
  */
-function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir='', $object=null)
+function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '', $object = null)
 {
     global $db, $langs;
 
     $error = 0;
 
     if (empty($objectname)) return -1;
-    if (empty($readdir)) $readdir=$destdir;
+    if (empty($readdir)) $readdir = $destdir;
 
-    $pathoffiletoclasssrc=$readdir.'/class/'.strtolower($objectname).'.class.php';
+    $pathoffiletoclasssrc = $readdir.'/class/'.strtolower($objectname).'.class.php';
 
     // Edit .sql file
-    $pathoffiletoeditsrc=$readdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql';
-    $pathoffiletoedittarget=$destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql'.($readdir != $destdir ? '.new' : '');
-	if (! dol_is_file($pathoffiletoeditsrc))
+    $pathoffiletoeditsrc = $readdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql';
+    $pathoffiletoedittarget = $destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql'.($readdir != $destdir ? '.new' : '');
+	if (!dol_is_file($pathoffiletoeditsrc))
     {
     	$langs->load("errors");
     	setEventMessages($langs->trans("ErrorFileNotFound", $pathoffiletoeditsrc), null, 'errors');
@@ -234,14 +234,14 @@ 
     // Load object from myobject.class.php
     try
     {
-    	if (! is_object($object))
+    	if (!is_object($object))
     	{
     		include_once $pathoffiletoclasssrc;
-        	if (class_exists($objectname)) $object=new $objectname($db);
+        	if (class_exists($objectname)) $object = new $objectname($db);
         	else return -1;
     	}
     }
-    catch(Exception $e)
+    catch (Exception $e)
     {
         print $e->getMessage();
     }
@@ -251,38 +251,38 @@ 
 
     $contentsql = file_get_contents(dol_osencode($pathoffiletoeditsrc), 'r');
 
-    $i=0;
+    $i = 0;
     $texttoinsert = '-- BEGIN MODULEBUILDER FIELDS'."\n";
     if (count($object->fields))
     {
-        foreach($object->fields as $key => $val)
+        foreach ($object->fields as $key => $val)
         {
             $i++;
 
             $type = $val['type'];
-            $type = preg_replace('/:.*$/', '', $type);		// For case type = 'integer:Societe:societe/class/societe.class.php'
+            $type = preg_replace('/:.*$/', '', $type); // For case type = 'integer:Societe:societe/class/societe.class.php'
 
-            if ($type == 'html') $type = 'text';            // html modulebuilder type is a text type in database
-            else if ($type == 'price') $type = 'double';            // html modulebuilder type is a text type in database
+            if ($type == 'html') $type = 'text'; // html modulebuilder type is a text type in database
+            else if ($type == 'price') $type = 'double'; // html modulebuilder type is a text type in database
             else if ($type == 'link' || $type == 'sellist') $type = 'integer';
-            $texttoinsert.= "\t".$key." ".$type;
-            if ($key == 'rowid')  $texttoinsert.= ' AUTO_INCREMENT PRIMARY KEY';
-            if ($key == 'entity') $texttoinsert.= ' DEFAULT 1';
+            $texttoinsert .= "\t".$key." ".$type;
+            if ($key == 'rowid')  $texttoinsert .= ' AUTO_INCREMENT PRIMARY KEY';
+            if ($key == 'entity') $texttoinsert .= ' DEFAULT 1';
             else
             {
             	if ($val['default'] != '')
             	{
-            		if (preg_match('/^null$/i', $val['default'])) $texttoinsert.= " DEFAULT NULL";
-            		else if (preg_match('/varchar/', $type )) $texttoinsert.= " DEFAULT '".$db->escape($val['default'])."'";
-            		else $texttoinsert.= (($val['default'] > 0)?' DEFAULT '.$val['default']:'');
+            		if (preg_match('/^null$/i', $val['default'])) $texttoinsert .= " DEFAULT NULL";
+            		else if (preg_match('/varchar/', $type)) $texttoinsert .= " DEFAULT '".$db->escape($val['default'])."'";
+            		else $texttoinsert .= (($val['default'] > 0) ? ' DEFAULT '.$val['default'] : '');
             	}
             }
-            $texttoinsert.= (($val['notnull'] > 0)?' NOT NULL':'');
-            if ($i < count($object->fields)) $texttoinsert.=", ";
-            $texttoinsert.= "\n";
+            $texttoinsert .= (($val['notnull'] > 0) ? ' NOT NULL' : '');
+            if ($i < count($object->fields)) $texttoinsert .= ", ";
+            $texttoinsert .= "\n";
         }
     }
-    $texttoinsert.= "\t".'-- END MODULEBUILDER FIELDS';
+    $texttoinsert .= "\t".'-- END MODULEBUILDER FIELDS';
 
     $contentsql = preg_replace('/-- BEGIN MODULEBUILDER FIELDS.*END MODULEBUILDER FIELDS/ims', $texttoinsert, $contentsql);
 
@@ -297,35 +297,35 @@ 
     }
 
     // Edit .key.sql file
-    $pathoffiletoeditsrc=$destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql';
-    $pathoffiletoedittarget=$destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql'.($readdir != $destdir ? '.new' : '');
+    $pathoffiletoeditsrc = $destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql';
+    $pathoffiletoedittarget = $destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql'.($readdir != $destdir ? '.new' : '');
 
     $contentsql = file_get_contents(dol_osencode($pathoffiletoeditsrc), 'r');
 
-    $i=0;
+    $i = 0;
     $texttoinsert = '-- BEGIN MODULEBUILDER INDEXES'."\n";
     if (count($object->fields))
     {
-        foreach($object->fields as $key => $val)
+        foreach ($object->fields as $key => $val)
         {
             $i++;
-            if (! empty($val['index']))
+            if (!empty($val['index']))
             {
-                $texttoinsert.= "ALTER TABLE llx_".strtolower($module).'_'.strtolower($objectname)." ADD INDEX idx_".strtolower($module).'_'.strtolower($objectname)."_".$key." (".$key.");";
-                $texttoinsert.= "\n";
+                $texttoinsert .= "ALTER TABLE llx_".strtolower($module).'_'.strtolower($objectname)." ADD INDEX idx_".strtolower($module).'_'.strtolower($objectname)."_".$key." (".$key.");";
+                $texttoinsert .= "\n";
             }
-            if (! empty($val['foreignkey']))
+            if (!empty($val['foreignkey']))
             {
-            	$tmp=explode('.',$val['foreignkey']);
-            	if (! empty($tmp[0]) && ! empty($tmp[1]))
+            	$tmp = explode('.', $val['foreignkey']);
+            	if (!empty($tmp[0]) && !empty($tmp[1]))
             	{
-            		$texttoinsert.= "ALTER TABLE llx_".strtolower($module).'_'.strtolower($objectname)." ADD CONSTRAINT llx_".strtolower($module).'_'.strtolower($objectname)."_".$key." FOREIGN KEY (".$key.") REFERENCES ".$tmp[0]."(".$tmp[1].");";
-            		$texttoinsert.= "\n";
+            		$texttoinsert .= "ALTER TABLE llx_".strtolower($module).'_'.strtolower($objectname)." ADD CONSTRAINT llx_".strtolower($module).'_'.strtolower($objectname)."_".$key." FOREIGN KEY (".$key.") REFERENCES ".$tmp[0]."(".$tmp[1].");";
+            		$texttoinsert .= "\n";
             	}
             }
         }
     }
-    $texttoinsert.= '-- END MODULEBUILDER INDEXES';
+    $texttoinsert .= '-- END MODULEBUILDER INDEXES';
 
     $contentsql = preg_replace('/-- BEGIN MODULEBUILDER INDEXES.*END MODULEBUILDER INDEXES/ims', $texttoinsert, $contentsql);
 

dolibarr/htdocs/core/lib/member.lib.php

Spacing +30 added lines, -30 removed lines

@@ -42,8 +42,8 @@ 
 	$head[$h][2] = 'general';
 	$h++;
 
-	if ((! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_MEMBER_ACTIVE))
-		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || ! empty($user->admin)))
+	if ((!empty($conf->ldap->enabled) && !empty($conf->global->LDAP_MEMBER_ACTIVE))
+		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin)))
 	{
 		$langs->load("ldap");
 
@@ -53,13 +53,13 @@ 
 		$h++;
 	}
 
-	if (! empty($user->rights->adherent->cotisation->lire))
+	if (!empty($user->rights->adherent->cotisation->lire))
 	{
-		$nbSubscription = is_array($object->subscriptions)?count($object->subscriptions):0;
+		$nbSubscription = is_array($object->subscriptions) ?count($object->subscriptions) : 0;
 		$head[$h][0] = DOL_URL_ROOT.'/adherents/subscription.php?rowid='.$object->id;
 		$head[$h][1] = $langs->trans("Subscriptions");
 		$head[$h][2] = 'subscription';
-		if ($nbSubscription > 0) $head[$h][1].= ' <span class="badge">'.$nbSubscription.'</span>';
+		if ($nbSubscription > 0) $head[$h][1] .= ' <span class="badge">'.$nbSubscription.'</span>';
 		$h++;
 	}
 
@@ -67,45 +67,45 @@ 
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'member');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'member');
 
     $nbNote = 0;
-    if(!empty($object->note)) $nbNote++;
-    if(!empty($object->note_private)) $nbNote++;
-    if(!empty($object->note_public)) $nbNote++;
+    if (!empty($object->note)) $nbNote++;
+    if (!empty($object->note_private)) $nbNote++;
+    if (!empty($object->note_public)) $nbNote++;
     $head[$h][0] = DOL_URL_ROOT.'/adherents/note.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Note");
 	$head[$h][2] = 'note';
-    if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+    if ($nbNote > 0) $head[$h][1] .= ' <span class="badge">'.$nbNote.'</span>';
 	$h++;
 
     // Attachments
     require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-    $upload_dir = $conf->adherent->multidir_output[$object->entity].'/'.get_exdir(0,0,0,1,$object,'member');
-    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
-    $nbLinks=Link::count($db, $object->element, $object->id);
+    $upload_dir = $conf->adherent->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, 'member');
+    $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+    $nbLinks = Link::count($db, $object->element, $object->id);
     $head[$h][0] = DOL_URL_ROOT.'/adherents/document.php?id='.$object->id;
     $head[$h][1] = $langs->trans('Documents');
-    if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ' <span class="badge">'.($nbFiles + $nbLinks).'</span>';
     $head[$h][2] = 'document';
     $h++;
 
 	// Show agenda tab
-	if (! empty($conf->agenda->enabled))
+	if (!empty($conf->agenda->enabled))
 	{
 	    $head[$h][0] = DOL_URL_ROOT."/adherents/agenda.php?id=".$object->id;
 	    $head[$h][1] = $langs->trans("Events");
-	    if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
+	    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
 	    {
-	        $head[$h][1].= '/';
-	        $head[$h][1].= $langs->trans("Agenda");
+	        $head[$h][1] .= '/';
+	        $head[$h][1] .= $langs->trans("Agenda");
 	    }
 	    $head[$h][2] = 'agenda';
 	    $h++;
 	}
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'member','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'member', 'remove');
 
 	return $head;
 }
@@ -120,7 +120,7 @@ 
 {
 	global $langs, $conf, $user;
 
-	$h=0;
+	$h = 0;
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/adherents/type.php?rowid='.$object->id;
@@ -128,8 +128,8 @@ 
 	$head[$h][2] = 'card';
 	$h++;
 
-	if ((! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE))
-		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || ! empty($user->admin)))
+	if ((!empty($conf->ldap->enabled) && !empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE))
+		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin)))
 	{
 		$langs->load("ldap");
 
@@ -143,9 +143,9 @@ 
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'membertype');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'membertype');
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'membertype','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'membertype', 'remove');
 
 	return $head;
 }
@@ -176,7 +176,7 @@ 
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-    complete_head_from_modules($conf,$langs,'',$head,$h,'member_admin');
+    complete_head_from_modules($conf, $langs, '', $head, $h, 'member_admin');
 
     $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_extrafields.php';
     $head[$h][1] = $langs->trans("ExtraFieldsMember");
@@ -193,7 +193,7 @@ 
     $head[$h][2] = 'website';
     $h++;
 
-    complete_head_from_modules($conf,$langs,'',$head,$h,'member_admin','remove');
+    complete_head_from_modules($conf, $langs, '', $head, $h, 'member_admin', 'remove');
 
     return $head;
 }
@@ -246,9 +246,9 @@ 
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'member_stats');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'member_stats');
 
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'member_stats','remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'member_stats', 'remove');
 
     return $head;
 }
@@ -280,9 +280,9 @@ 
 	// Entries must be declared in modules descriptor with line
 	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
 	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'subscription');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'subscription');
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'subscription','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'subscription', 'remove');
 
 	return $head;
 }

dolibarr/htdocs/core/lib/contract.lib.php

Spacing +13 added lines, -13 removed lines

@@ -42,10 +42,10 @@ 
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
-	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+	    $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 	    $head[$h][0] = DOL_URL_ROOT.'/contrat/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("ContactsAddresses");
-		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+		if ($nbContact > 0) $head[$h][1] .= ' <span class="badge">'.$nbContact.'</span>';
 		$head[$h][2] = 'contact';
 		$h++;
 	}
@@ -54,28 +54,28 @@ 
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'contract');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'contract');
 
     if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
     {
     	$nbNote = 0;
-        if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
+        if (!empty($object->note_private)) $nbNote++;
+		if (!empty($object->note_public)) $nbNote++;
     	$head[$h][0] = DOL_URL_ROOT.'/contrat/note.php?id='.$object->id;
     	$head[$h][1] = $langs->trans("Notes");
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if ($nbNote > 0) $head[$h][1] .= ' <span class="badge">'.$nbNote.'</span>';
     	$head[$h][2] = 'note';
     	$h++;
     }
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->contrat->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
-    $nbLinks=Link::count($db, $object->element, $object->id);
+	$upload_dir = $conf->contrat->dir_output."/".dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+    $nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/contrat/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Documents");
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ' <span class="badge">'.($nbFiles + $nbLinks).'</span>';
 	$head[$h][2] = 'documents';
 	$h++;
 
@@ -84,7 +84,7 @@ 
 	$head[$h][2] = 'info';
 	$h++;
 
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'contract','remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'contract', 'remove');
 
 	return $head;
 }
@@ -110,7 +110,7 @@ 
 	// Entries must be declared in modules descriptor with line
 	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
 	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-	complete_head_from_modules($conf,$langs,null,$head,$h,'contract_admin');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'contract_admin');
 
 	$head[$h][0] = DOL_URL_ROOT.'/contrat/admin/contract_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
@@ -124,7 +124,7 @@ 
 
 
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'contract_admin','remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'contract_admin', 'remove');
 
 		return $head;
 }

dolibarr/htdocs/core/lib/format_cards.lib.php

Spacing +18 added lines, -18 removed lines

@@ -38,22 +38,22 @@ 
 {
     while ($row = $db->fetch_array($resql))
     {
-        $_Avery_Labels[$row['code']]['name']=$row['name'];
-        $_Avery_Labels[$row['code']]['paper-size']=$row['paper_size'];
-        $_Avery_Labels[$row['code']]['orientation']=$row['orientation'];
-        $_Avery_Labels[$row['code']]['metric']=$row['metric'];
-        $_Avery_Labels[$row['code']]['marginLeft']=$row['leftmargin'];
-        $_Avery_Labels[$row['code']]['marginTop']=$row['topmargin'];
-        $_Avery_Labels[$row['code']]['marginTop']=$row['topmargin'];
-        $_Avery_Labels[$row['code']]['NX']=$row['nx'];
-        $_Avery_Labels[$row['code']]['NY']=$row['ny'];
-        $_Avery_Labels[$row['code']]['SpaceX']=$row['spacex'];
-        $_Avery_Labels[$row['code']]['SpaceY']=$row['spacey'];
-        $_Avery_Labels[$row['code']]['width']=$row['width'];
-        $_Avery_Labels[$row['code']]['height']=$row['height'];
-        $_Avery_Labels[$row['code']]['font-size']=$row['font_size'];
-        $_Avery_Labels[$row['code']]['custom_x']=$row['custom_x'];
-        $_Avery_Labels[$row['code']]['custom_y']=$row['custom_y'];
+        $_Avery_Labels[$row['code']]['name'] = $row['name'];
+        $_Avery_Labels[$row['code']]['paper-size'] = $row['paper_size'];
+        $_Avery_Labels[$row['code']]['orientation'] = $row['orientation'];
+        $_Avery_Labels[$row['code']]['metric'] = $row['metric'];
+        $_Avery_Labels[$row['code']]['marginLeft'] = $row['leftmargin'];
+        $_Avery_Labels[$row['code']]['marginTop'] = $row['topmargin'];
+        $_Avery_Labels[$row['code']]['marginTop'] = $row['topmargin'];
+        $_Avery_Labels[$row['code']]['NX'] = $row['nx'];
+        $_Avery_Labels[$row['code']]['NY'] = $row['ny'];
+        $_Avery_Labels[$row['code']]['SpaceX'] = $row['spacex'];
+        $_Avery_Labels[$row['code']]['SpaceY'] = $row['spacey'];
+        $_Avery_Labels[$row['code']]['width'] = $row['width'];
+        $_Avery_Labels[$row['code']]['height'] = $row['height'];
+        $_Avery_Labels[$row['code']]['font-size'] = $row['font_size'];
+        $_Avery_Labels[$row['code']]['custom_x'] = $row['custom_x'];
+        $_Avery_Labels[$row['code']]['custom_y'] = $row['custom_y'];
     }
 }
 else
@@ -62,8 +62,8 @@ 
 }
 
 // We add characteristics to the name
-foreach($_Avery_Labels as $key => $val)
+foreach ($_Avery_Labels as $key => $val)
 {
-	$_Avery_Labels[$key]['name'].=' ('.$_Avery_Labels[$key]['paper-size'].' - '.$_Avery_Labels[$key]['NX'].'x'.$_Avery_Labels[$key]['NY'].')';
+	$_Avery_Labels[$key]['name'] .= ' ('.$_Avery_Labels[$key]['paper-size'].' - '.$_Avery_Labels[$key]['NX'].'x'.$_Avery_Labels[$key]['NY'].')';
 }
 

dolibarr/htdocs/core/lib/loan.lib.php

Spacing +8 added lines, -8 removed lines

@@ -50,25 +50,25 @@ 
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $tab,'loan');
+    complete_head_from_modules($conf, $langs, $object, $head, $tab, 'loan');
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->loan->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
-    $nbLinks=Link::count($db, $object->element, $object->id);
+	$upload_dir = $conf->loan->dir_output."/".dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+    $nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$tab][0] = DOL_URL_ROOT.'/loan/document.php?id='.$object->id;
 	$head[$tab][1] = $langs->trans("Documents");
-	if (($nbFiles+$nbLinks) > 0) $head[$tab][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) $head[$tab][1] .= ' <span class="badge">'.($nbFiles + $nbLinks).'</span>';
 	$head[$tab][2] = 'documents';
 	$tab++;
 
 	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 	{
-		$nbNote = (empty($object->note_private)?0:1)+(empty($object->note_public)?0:1);
+		$nbNote = (empty($object->note_private) ? 0 : 1) + (empty($object->note_public) ? 0 : 1);
 		$head[$tab][0] = DOL_URL_ROOT."/loan/note.php?id=".$object->id;
 		$head[$tab][1] = $langs->trans("Notes");
-		if($nbNote > 0) $head[$tab][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if ($nbNote > 0) $head[$tab][1] .= ' <span class="badge">'.$nbNote.'</span>';
 		$head[$tab][2] = 'note';
 		$tab++;
 	}
@@ -78,7 +78,7 @@ 
     $head[$tab][2] = 'info';
     $tab++;
 
-    complete_head_from_modules($conf,$langs,$object,$head,$tab,'loan','remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $tab, 'loan', 'remove');
 
     return $head;
 }

dolibarr/htdocs/core/lib/images.lib.php

Spacing +87 added lines, -87 removed lines

@@ -23,8 +23,8 @@ 
  */
 
 // Define size of logo small and mini
-$maxwidthsmall=270;$maxheightsmall=150;
-$maxwidthmini=128;$maxheightmini=72;
+$maxwidthsmall = 270; $maxheightsmall = 150;
+$maxwidthmini = 128; $maxheightmini = 72;
 $quality = 80;
 
 
@@ -37,13 +37,13 @@ 
  */
 function image_format_supported($file)
 {
-    $regeximgext='\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.xpm|\.xbm|\.svg';   // See also into product.class.php
+    $regeximgext = '\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.xpm|\.xbm|\.svg'; // See also into product.class.php
 
     // Case filename is not a format image
-    if (! preg_match('/('.$regeximgext.')$/i',$file,$reg)) return -1;
+    if (!preg_match('/('.$regeximgext.')$/i', $file, $reg)) return -1;
 
     // Case filename is a format image but not supported by this PHP
-    $imgfonction='';
+    $imgfonction = '';
     if (strtolower($reg[1]) == '.gif')  $imgfonction = 'imagecreatefromgif';
     if (strtolower($reg[1]) == '.png')  $imgfonction = 'imagecreatefrompng';
     if (strtolower($reg[1]) == '.jpg')  $imgfonction = 'imagecreatefromjpeg';
@@ -53,7 +53,7 @@ 
     if (strtolower($reg[1]) == '.xbm')  $imgfonction = 'imagecreatefromxbm';
     if ($imgfonction)
     {
-        if (! function_exists($imgfonction))
+        if (!function_exists($imgfonction))
         {
             // Fonctions de conversion non presente dans ce PHP
             return 0;
@@ -74,21 +74,21 @@ 
  */
 function dol_getImageSize($file, $url = false)
 {
-	$ret=array();
+	$ret = array();
 
 	if (image_format_supported($file) < 0) return $ret;
 
 	$filetoread = $file;
 	if (!$url)
 	{
-		$filetoread = realpath(dol_osencode($file)); 	// Chemin canonique absolu de l'image
+		$filetoread = realpath(dol_osencode($file)); // Chemin canonique absolu de l'image
 	}
 
 	if ($filetoread)
 	{
     	$infoImg = getimagesize($filetoread); // Recuperation des infos de l'image
-    	$ret['width']=$infoImg[0]; // Largeur de l'image
-    	$ret['height']=$infoImg[1]; // Hauteur de l'image
+    	$ret['width'] = $infoImg[0]; // Largeur de l'image
+    	$ret['height'] = $infoImg[1]; // Hauteur de l'image
 	}
 
 	return $ret;
@@ -106,33 +106,33 @@ 
  * 		@param	int		$src_y			Position of croping image in source image (not use if mode=0)
  *		@return	int						File name if OK, error message if KO
  */
-function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x=0, $src_y=0)
+function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0, $src_y = 0)
 {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-	global $conf,$langs;
+	global $conf, $langs;
 
 	dol_syslog("dol_imageResizeOrCrop file=".$file." mode=".$mode." newWidth=".$newWidth." newHeight=".$newHeight." src_x=".$src_x." src_y=".$src_y);
 
 	// Clean parameters
-	$file=trim($file);
+	$file = trim($file);
 
 	// Check parameters
-	if (! $file)
+	if (!$file)
 	{
 		// Si le fichier n'a pas ete indique
 		return 'Bad parameter file';
 	}
-	elseif (! file_exists($file))
+	elseif (!file_exists($file))
 	{
 		// Si le fichier passe en parametre n'existe pas
-		return $langs->trans("ErrorFileNotFound",$file);
+		return $langs->trans("ErrorFileNotFound", $file);
 	}
-	elseif(image_format_supported($file) < 0)
+	elseif (image_format_supported($file) < 0)
 	{
 		return 'This filename '.$file.' does not seem to be an image filename.';
 	}
-	elseif(!is_numeric($newWidth) && !is_numeric($newHeight))
+	elseif (!is_numeric($newWidth) && !is_numeric($newHeight))
 	{
 		return 'Wrong value for parameter newWidth or newHeight';
 	}
@@ -145,7 +145,7 @@ 
 		return 'Both newHeight or newWidth must be defined for croping';
 	}
 
-	$filetoread = realpath(dol_osencode($file)); 	// Chemin canonique absolu de l'image
+	$filetoread = realpath(dol_osencode($file)); // Chemin canonique absolu de l'image
 
 	$infoImg = getimagesize($filetoread); // Recuperation des infos de l'image
 	$imgWidth = $infoImg[0]; // Largeur de l'image
@@ -153,18 +153,18 @@ 
 
 	if ($mode == 0)	// If resize, we check parameters
 	{
-		if ($newWidth  <= 0)
+		if ($newWidth <= 0)
 		{
-			$newWidth=intval(($newHeight / $imgHeight) * $imgWidth);	// Keep ratio
+			$newWidth = intval(($newHeight / $imgHeight) * $imgWidth); // Keep ratio
 		}
 		if ($newHeight <= 0)
 		{
-			$newHeight=intval(($newWidth / $imgWidth) * $imgHeight);	// Keep ratio
+			$newHeight = intval(($newWidth / $imgWidth) * $imgHeight); // Keep ratio
 		}
 	}
 
-	$imgfonction='';
-	switch($infoImg[2])
+	$imgfonction = '';
+	switch ($infoImg[2])
 	{
 		case 1:	// IMG_GIF
 			$imgfonction = 'imagecreatefromgif';
@@ -181,7 +181,7 @@ 
 	}
 	if ($imgfonction)
 	{
-		if (! function_exists($imgfonction))
+		if (!function_exists($imgfonction))
 		{
 			// Fonctions de conversion non presente dans ce PHP
 			return 'Resize not possible. This PHP does not support GD functions '.$imgfonction;
@@ -189,27 +189,27 @@ 
 	}
 
 	// Initialisation des variables selon l'extension de l'image
-	switch($infoImg[2])
+	switch ($infoImg[2])
 	{
 		case 1:	// Gif
 			$img = imagecreatefromgif($filetoread);
-			$extImg = '.gif';	// File name extension of image
-			$newquality='NU';	// Quality is not used for this format
+			$extImg = '.gif'; // File name extension of image
+			$newquality = 'NU'; // Quality is not used for this format
 			break;
 		case 2:	// Jpg
 			$img = imagecreatefromjpeg($filetoread);
 			$extImg = '.jpg';
-			$newquality=100;	// % quality maximum
+			$newquality = 100; // % quality maximum
 			break;
 		case 3:	// Png
 			$img = imagecreatefrompng($filetoread);
 			$extImg = '.png';
-			$newquality=0;		// No compression (0-9)
+			$newquality = 0; // No compression (0-9)
 			break;
 		case 4:	// Bmp
 			$img = imagecreatefromwbmp($filetoread);
 			$extImg = '.bmp';
-			$newquality='NU';	// Quality is not used for this format
+			$newquality = 'NU'; // Quality is not used for this format
 			break;
 	}
 
@@ -237,18 +237,18 @@ 
 	}
 
 	// Initialisation des variables selon l'extension de l'image
-	switch($infoImg[2])
+	switch ($infoImg[2])
 	{
 		case 1:	// Gif
 			$trans_colour = imagecolorallocate($imgThumb, 255, 255, 255); // On procede autrement pour le format GIF
-			imagecolortransparent($imgThumb,$trans_colour);
+			imagecolortransparent($imgThumb, $trans_colour);
 			break;
 		case 2:	// Jpg
 			$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0);
 			break;
 		case 3:	// Png
-			imagealphablending($imgThumb,false); // Pour compatibilite sur certain systeme
-			$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 127);	// Keep transparent channel
+			imagealphablending($imgThumb, false); // Pour compatibilite sur certain systeme
+			$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 127); // Keep transparent channel
 			break;
 		case 4:	// Bmp
 			$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0);
@@ -258,7 +258,7 @@ 
 
 	dol_syslog("dol_imageResizeOrCrop: convert image from ($imgWidth x $imgHeight) at position ($src_x x $src_y) to ($newWidth x $newHeight) as $extImg, newquality=$newquality");
 	//imagecopyresized($imgThumb, $img, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imgWidth, $imgHeight); // Insere l'image de base redimensionnee
-	imagecopyresampled($imgThumb, $img, 0, 0, $src_x, $src_y, $newWidth, $newHeight, ($mode==0?$imgWidth:$newWidth), ($mode==0?$imgHeight:$newHeight)); // Insere l'image de base redimensionnee
+	imagecopyresampled($imgThumb, $img, 0, 0, $src_x, $src_y, $newWidth, $newHeight, ($mode == 0 ? $imgWidth : $newWidth), ($mode == 0 ? $imgHeight : $newHeight)); // Insere l'image de base redimensionnee
 
 	$imgThumbName = $file;
 
@@ -267,7 +267,7 @@ 
 	//fclose($fp);
 
 	// Create image on disk
-	switch($infoImg[2])
+	switch ($infoImg[2])
 	{
 		case 1:	// Gif
 			imagegif($imgThumb, $imgThumbName);
@@ -284,13 +284,13 @@ 
 	}
 
 	// Set permissions on file
-	if (! empty($conf->global->MAIN_UMASK)) @chmod($imgThumbName, octdec($conf->global->MAIN_UMASK));
+	if (!empty($conf->global->MAIN_UMASK)) @chmod($imgThumbName, octdec($conf->global->MAIN_UMASK));
 
 	// Free memory. This does not delete image.
     imagedestroy($img);
 	imagedestroy($imgThumb);
 
-	clearstatcache();	// File was replaced by a modified one, so we clear file caches.
+	clearstatcache(); // File was replaced by a modified one, so we clear file caches.
 
 	return $imgThumbName;
 }
@@ -349,64 +349,64 @@ 
  *      @param     int		$targetformat     	New format of target (IMAGETYPE_GIF, IMAGETYPE_JPG, IMAGETYPE_PNG, IMAGETYPE_BMP, IMAGETYPE_WBMP ... or 0 to keep old format)
  *    	@return    string						Full path of thumb or '' if it fails or 'Error...' if it fails
  */
-function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $quality=50, $outdir='thumbs', $targetformat=0)
+function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small', $quality = 50, $outdir = 'thumbs', $targetformat = 0)
 {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-	global $conf,$langs;
+	global $conf, $langs;
 
 	dol_syslog("vignette file=".$file." extName=".$extName." maxWidth=".$maxWidth." maxHeight=".$maxHeight." quality=".$quality." outdir=".$outdir." targetformat=".$targetformat);
 
 	// Clean parameters
-	$file=trim($file);
+	$file = trim($file);
 
 	// Check parameters
-	if (! $file)
+	if (!$file)
 	{
 		// Si le fichier n'a pas ete indique
 		return 'ErrorBadParameters';
 	}
-	elseif (! file_exists($file))
+	elseif (!file_exists($file))
 	{
 		// Si le fichier passe en parametre n'existe pas
-        dol_syslog($langs->trans("ErrorFileNotFound",$file),LOG_ERR);
-	    return $langs->trans("ErrorFileNotFound",$file);
+        dol_syslog($langs->trans("ErrorFileNotFound", $file), LOG_ERR);
+	    return $langs->trans("ErrorFileNotFound", $file);
 	}
-	elseif(image_format_supported($file) < 0)
+	elseif (image_format_supported($file) < 0)
 	{
-        dol_syslog('This file '.$file.' does not seem to be an image format file name.',LOG_WARNING);
+        dol_syslog('This file '.$file.' does not seem to be an image format file name.', LOG_WARNING);
 	    return 'ErrorBadImageFormat';
 	}
-	elseif(!is_numeric($maxWidth) || empty($maxWidth) || $maxWidth < -1){
+	elseif (!is_numeric($maxWidth) || empty($maxWidth) || $maxWidth < -1) {
 		// Si la largeur max est incorrecte (n'est pas numerique, est vide, ou est inferieure a 0)
-        dol_syslog('Wrong value for parameter maxWidth',LOG_ERR);
+        dol_syslog('Wrong value for parameter maxWidth', LOG_ERR);
 	    return 'Error: Wrong value for parameter maxWidth';
 	}
-	elseif(!is_numeric($maxHeight) || empty($maxHeight) || $maxHeight < -1){
+	elseif (!is_numeric($maxHeight) || empty($maxHeight) || $maxHeight < -1) {
 		// Si la hauteur max est incorrecte (n'est pas numerique, est vide, ou est inferieure a 0)
-        dol_syslog('Wrong value for parameter maxHeight',LOG_ERR);
+        dol_syslog('Wrong value for parameter maxHeight', LOG_ERR);
 	    return 'Error: Wrong value for parameter maxHeight';
 	}
 
-	$filetoread = realpath(dol_osencode($file)); 	// Chemin canonique absolu de l'image
+	$filetoread = realpath(dol_osencode($file)); // Chemin canonique absolu de l'image
 
 	$infoImg = getimagesize($filetoread); // Recuperation des infos de l'image
 	$imgWidth = $infoImg[0]; // Largeur de l'image
 	$imgHeight = $infoImg[1]; // Hauteur de l'image
 
-	if ($maxWidth  == -1) $maxWidth=$infoImg[0];	// If size is -1, we keep unchanged
-	if ($maxHeight == -1) $maxHeight=$infoImg[1];	// If size is -1, we keep unchanged
+	if ($maxWidth == -1) $maxWidth = $infoImg[0]; // If size is -1, we keep unchanged
+	if ($maxHeight == -1) $maxHeight = $infoImg[1]; // If size is -1, we keep unchanged
 
 	// Si l'image est plus petite que la largeur et la hauteur max, on ne cree pas de vignette
 	if ($infoImg[0] < $maxWidth && $infoImg[1] < $maxHeight)
 	{
 		// On cree toujours les vignettes
-		dol_syslog("File size is smaller than thumb size",LOG_DEBUG);
+		dol_syslog("File size is smaller than thumb size", LOG_DEBUG);
 		//return 'Le fichier '.$file.' ne necessite pas de creation de vignette';
 	}
 
-	$imgfonction='';
-	switch($infoImg[2])
+	$imgfonction = '';
+	switch ($infoImg[2])
 	{
 		case IMAGETYPE_GIF:	    // 1
 			$imgfonction = 'imagecreatefromgif';
@@ -426,7 +426,7 @@ 
 	}
 	if ($imgfonction)
 	{
-		if (! function_exists($imgfonction))
+		if (!function_exists($imgfonction))
 		{
 			// Fonctions de conversion non presente dans ce PHP
 			return 'Error: Creation of thumbs not possible. This PHP does not support GD function '.$imgfonction;
@@ -434,12 +434,12 @@ 
 	}
 
 	// On cree le repertoire contenant les vignettes
-	$dirthumb = dirname($file).($outdir?'/'.$outdir:''); 	// Chemin du dossier contenant les vignettes
+	$dirthumb = dirname($file).($outdir ? '/'.$outdir : ''); // Chemin du dossier contenant les vignettes
 	dol_mkdir($dirthumb);
 
 	// Initialisation des variables selon l'extension de l'image
-	$img=null;
-	switch($infoImg[2])
+	$img = null;
+	switch ($infoImg[2])
 	{
 		case IMAGETYPE_GIF:	    // 1
 			$img = imagecreatefromgif($filetoread);
@@ -447,7 +447,7 @@ 
 			break;
 		case IMAGETYPE_JPEG:    // 2
 			$img = imagecreatefromjpeg($filetoread);
-			$extImg = (preg_match('/\.jpeg$/',$file)?'.jpeg':'.jpg'); // Extension de l'image
+			$extImg = (preg_match('/\.jpeg$/', $file) ? '.jpeg' : '.jpg'); // Extension de l'image
 			break;
 		case IMAGETYPE_PNG:	    // 3
 			$img = imagecreatefrompng($filetoread);
@@ -462,21 +462,21 @@ 
 			$extImg = '.bmp';
 			break;
 	}
-    if (! is_resource($img))
+    if (!is_resource($img))
     {
         dol_syslog('Failed to detect type of image. We found infoImg[2]='.$infoImg[2], LOG_WARNING);
         return 0;
     }
 
 	// Initialisation des dimensions de la vignette si elles sont superieures a l'original
-	if($maxWidth > $imgWidth){ $maxWidth = $imgWidth; }
-	if($maxHeight > $imgHeight){ $maxHeight = $imgHeight; }
+	if ($maxWidth > $imgWidth) { $maxWidth = $imgWidth; }
+	if ($maxHeight > $imgHeight) { $maxHeight = $imgHeight; }
 
-	$whFact = $maxWidth/$maxHeight; // Facteur largeur/hauteur des dimensions max de la vignette
-	$imgWhFact = $imgWidth/$imgHeight; // Facteur largeur/hauteur de l'original
+	$whFact = $maxWidth / $maxHeight; // Facteur largeur/hauteur des dimensions max de la vignette
+	$imgWhFact = $imgWidth / $imgHeight; // Facteur largeur/hauteur de l'original
 
 	// Fixe les dimensions de la vignette
-	if($whFact < $imgWhFact)
+	if ($whFact < $imgWhFact)
 	{
 		// Si largeur determinante
 		$thumbWidth  = $maxWidth;
@@ -488,11 +488,11 @@ 
 		$thumbHeight = $maxHeight;
 		$thumbWidth  = $thumbHeight * $imgWhFact;
 	}
-	$thumbHeight=round($thumbHeight);
-	$thumbWidth=round($thumbWidth);
+	$thumbHeight = round($thumbHeight);
+	$thumbWidth = round($thumbWidth);
 
     // Define target format
-    if (empty($targetformat)) $targetformat=$infoImg[2];
+    if (empty($targetformat)) $targetformat = $infoImg[2];
 
 	// Create empty image
 	if ($targetformat == IMAGETYPE_GIF)
@@ -519,35 +519,35 @@ 
 
 	// Initialisation des variables selon l'extension de l'image
 	// $targetformat is 0 by default, in such case, we keep original extension
-	switch($targetformat)
+	switch ($targetformat)
 	{
 		case IMAGETYPE_GIF:	    // 1
 			$trans_colour = imagecolorallocate($imgThumb, 255, 255, 255); // On procede autrement pour le format GIF
-			imagecolortransparent($imgThumb,$trans_colour);
+			imagecolortransparent($imgThumb, $trans_colour);
             $extImgTarget = '.gif';
-            $newquality='NU';
+            $newquality = 'NU';
             break;
 		case IMAGETYPE_JPEG:    // 2
             $trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0);
-            $extImgTarget = (preg_match('/\.jpeg$/i',$file)?'.jpeg':'.jpg');
-            $newquality=$quality;
+            $extImgTarget = (preg_match('/\.jpeg$/i', $file) ? '.jpeg' : '.jpg');
+            $newquality = $quality;
             break;
 		case IMAGETYPE_PNG:	    // 3
-			imagealphablending($imgThumb,false); // Pour compatibilite sur certain systeme
-			$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 127);	// Keep transparent channel
+			imagealphablending($imgThumb, false); // Pour compatibilite sur certain systeme
+			$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 127); // Keep transparent channel
             $extImgTarget = '.png';
-            $newquality=$quality-100;
-            $newquality=round(abs($quality-100)*9/100);
+            $newquality = $quality - 100;
+            $newquality = round(abs($quality - 100) * 9 / 100);
             break;
 		case IMAGETYPE_BMP:	    // 6
             // Not supported by PHP GD
             $extImgTarget = '.bmp';
-            $newquality='NU';
+            $newquality = 'NU';
             break;
 		case IMAGETYPE_WBMP:	// 15
 			$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0);
             $extImgTarget = '.bmp';
-            $newquality='NU';
+            $newquality = 'NU';
             break;
 	}
 	if (function_exists("imagefill")) imagefill($imgThumb, 0, 0, $trans_colour);
@@ -556,10 +556,10 @@ 
 	//imagecopyresized($imgThumb, $img, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imgWidth, $imgHeight); // Insere l'image de base redimensionnee
 	imagecopyresampled($imgThumb, $img, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imgWidth, $imgHeight); // Insere l'image de base redimensionnee
 
-	$fileName = preg_replace('/(\.gif|\.jpeg|\.jpg|\.png|\.bmp)$/i','',$file);	// On enleve extension quelquesoit la casse
+	$fileName = preg_replace('/(\.gif|\.jpeg|\.jpg|\.png|\.bmp)$/i', '', $file); // On enleve extension quelquesoit la casse
 	$fileName = basename($fileName);
 	//$imgThumbName = $dirthumb.'/'.getImageFileNameForSize(basename($file), $extName, $extImgTarget);   // Full path of thumb file
-	$imgThumbName = getImageFileNameForSize($file, $extName, $extImgTarget);   // Full path of thumb file
+	$imgThumbName = getImageFileNameForSize($file, $extName, $extImgTarget); // Full path of thumb file
 
 
 	// Check if permission are ok
@@ -567,7 +567,7 @@ 
 	//fclose($fp);
 
 	// Create image on disk
-	switch($targetformat)
+	switch ($targetformat)
 	{
 		case IMAGETYPE_GIF:	    // 1
 			imagegif($imgThumb, $imgThumbName);
@@ -587,7 +587,7 @@ 
 	}
 
 	// Set permissions on file
-	if (! empty($conf->global->MAIN_UMASK)) @chmod($imgThumbName, octdec($conf->global->MAIN_UMASK));
+	if (!empty($conf->global->MAIN_UMASK)) @chmod($imgThumbName, octdec($conf->global->MAIN_UMASK));
 
     // Free memory. This does not delete image.
     imagedestroy($img);

dolibarr/htdocs/core/lib/sendings.lib.php

Spacing +72 added lines, -72 removed lines

@@ -37,7 +37,7 @@ 
 	global $db, $langs, $conf, $user;
 
 	// Load translation files required by the page
-    $langs->loadLangs(array("sendings","deliveries"));
+    $langs->loadLangs(array("sendings", "deliveries"));
 
 	$h = 0;
 	$head = array();
@@ -50,8 +50,8 @@ 
 	if ($conf->livraison_bon->enabled && $user->rights->expedition->livraison->lire)
 	{
 		// delivery link
-		$object->fetchObjectLinked($object->id,$object->element);
-		if (count($object->linkedObjectsIds['delivery']) >  0)		// If there is a delivery
+		$object->fetchObjectLinked($object->id, $object->element);
+		if (count($object->linkedObjectsIds['delivery']) > 0)		// If there is a delivery
 		{
 		    // Take first one element of array
 		    $tmp = reset($object->linkedObjectsIds['delivery']);
@@ -71,22 +71,22 @@ 
 	        $objectsrc = new Commande($db);
 	        $objectsrc->fetch($object->origin_id);
 	    }
-	    $nbContact = count($objectsrc->liste_contact(-1,'internal')) + count($objectsrc->liste_contact(-1,'external'));
+	    $nbContact = count($objectsrc->liste_contact(-1, 'internal')) + count($objectsrc->liste_contact(-1, 'external'));
 	    $head[$h][0] = DOL_URL_ROOT."/expedition/contact.php?id=".$object->id;
     	$head[$h][1] = $langs->trans("ContactsAddresses");
-		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+		if ($nbContact > 0) $head[$h][1] .= ' <span class="badge">'.$nbContact.'</span>';
     	$head[$h][2] = 'contact';
     	$h++;
 	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->commande->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
-    $nbLinks=Link::count($db, $object->element, $object->id);
+	$upload_dir = $conf->commande->dir_output."/".dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+    $nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/expedition/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ' <span class="badge">'.($nbFiles + $nbLinks).'</span>';
 	$head[$h][2] = 'documents';
 	$h++;
 
@@ -95,7 +95,7 @@ 
     if (!empty($object->note_public)) $nbNote++;
 	$head[$h][0] = DOL_URL_ROOT."/expedition/note.php?id=".$object->id;
 	$head[$h][1] = $langs->trans("Notes");
-	if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+	if ($nbNote > 0) $head[$h][1] .= ' <span class="badge">'.$nbNote.'</span>';
 	$head[$h][2] = 'note';
 	$h++;
 
@@ -103,9 +103,9 @@ 
 	// Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'delivery');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'delivery');
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'delivery','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'delivery', 'remove');
 
 	return $head;
 }
@@ -122,7 +122,7 @@ 
 	global $langs, $conf, $user;
 
 	// Load translation files required by the page
-    $langs->loadLangs(array("sendings","deliveries"));
+    $langs->loadLangs(array("sendings", "deliveries"));
 
 	$h = 0;
 	$head = array();
@@ -158,9 +158,9 @@ 
     $tmpObjectId = $object->id;
     $object->id = $object->origin_id;
 
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'delivery');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'delivery');
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'delivery','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'delivery', 'remove');
 
 	$object->id = $tmpObjectId;
 	return $head;
@@ -174,34 +174,34 @@ 
  * @param	string		$filter			Filter
  * @return	int							<0 if KO, >0 if OK
  */
-function show_list_sending_receive($origin,$origin_id,$filter='')
+function show_list_sending_receive($origin, $origin_id, $filter = '')
 {
 	global $db, $conf, $langs, $bc;
 	global $form;
 
-	$product_static=new Product($db);
-	$expedition=new Expedition($db);
-	$warehousestatic=new Entrepot($db);
+	$product_static = new Product($db);
+	$expedition = new Expedition($db);
+	$warehousestatic = new Entrepot($db);
 
 	$sql = "SELECT obj.rowid, obj.fk_product, obj.label, obj.description, obj.product_type as fk_product_type, obj.qty as qty_asked, obj.date_start, obj.date_end,";
-	$sql.= " ed.rowid as edrowid, ed.qty as qty_shipped, ed.fk_expedition as expedition_id, ed.fk_origin_line, ed.fk_entrepot as warehouse_id,";
-	$sql.= " e.rowid as sendingid, e.ref as exp_ref, e.date_creation, e.date_delivery, e.date_expedition,";
+	$sql .= " ed.rowid as edrowid, ed.qty as qty_shipped, ed.fk_expedition as expedition_id, ed.fk_origin_line, ed.fk_entrepot as warehouse_id,";
+	$sql .= " e.rowid as sendingid, e.ref as exp_ref, e.date_creation, e.date_delivery, e.date_expedition,";
 	//if ($conf->livraison_bon->enabled) $sql .= " l.rowid as livraison_id, l.ref as livraison_ref, l.date_delivery, ld.qty as qty_received,";
-	$sql.= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, p.tobatch as product_tobatch,';
-	$sql.= ' p.description as product_desc';
-	$sql.= " FROM ".MAIN_DB_PREFIX."expeditiondet as ed";
-	$sql.= ", ".MAIN_DB_PREFIX."expedition as e";
-	$sql.= ", ".MAIN_DB_PREFIX.$origin."det as obj";
+	$sql .= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, p.tobatch as product_tobatch,';
+	$sql .= ' p.description as product_desc';
+	$sql .= " FROM ".MAIN_DB_PREFIX."expeditiondet as ed";
+	$sql .= ", ".MAIN_DB_PREFIX."expedition as e";
+	$sql .= ", ".MAIN_DB_PREFIX.$origin."det as obj";
 	//if ($conf->livraison_bon->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.fk_expedition = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."livraisondet as ld ON ld.fk_livraison = l.rowid  AND obj.rowid = ld.fk_origin_line";
-	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid";
 	//TODO Add link to expeditiondet_batch
-	$sql.= " WHERE e.entity IN (".getEntity('expedition').")";
-	$sql.= " AND obj.fk_".$origin." = ".$origin_id;
-	$sql.= " AND obj.rowid = ed.fk_origin_line";
-	$sql.= " AND ed.fk_expedition = e.rowid";
-	if ($filter) $sql.= $filter;
+	$sql .= " WHERE e.entity IN (".getEntity('expedition').")";
+	$sql .= " AND obj.fk_".$origin." = ".$origin_id;
+	$sql .= " AND obj.rowid = ed.fk_origin_line";
+	$sql .= " AND ed.fk_expedition = e.rowid";
+	if ($filter) $sql .= $filter;
 
-	$sql.= " ORDER BY obj.fk_product";
+	$sql .= " ORDER BY obj.fk_product";
 
 	dol_syslog("show_list_sending_receive", LOG_DEBUG);
 	$resql = $db->query($sql);
@@ -223,7 +223,7 @@ 
 			print '<td align="center">'.$langs->trans("DateCreation").'</td>';
 			print '<td align="center">'.$langs->trans("DateDeliveryPlanned").'</td>';
 			print '<td align="center">'.$langs->trans("QtyPreparedOrShipped").'</td>';
-			if (! empty($conf->stock->enabled))
+			if (!empty($conf->stock->enabled))
 			{
                 print '<td>'.$langs->trans("Warehouse").'</td>';
 			}
@@ -233,7 +233,7 @@ 
 			    print '<td>';
 			    print '</td>';
 			}*/
-			if (! empty($conf->livraison_bon->enabled))
+			if (!empty($conf->livraison_bon->enabled))
 			{
 				print '<td>'.$langs->trans("DeliveryOrder").'</td>';
 				//print '<td align="center">'.$langs->trans("QtyReceived").'</td>';
@@ -249,59 +249,59 @@ 
 
 				// Sending id
 				print '<td align="left" class="nowrap">';
-				print '<a href="'.DOL_URL_ROOT.'/expedition/card.php?id='.$objp->expedition_id.'">'.img_object($langs->trans("ShowSending"),'sending').' '.$objp->exp_ref.'<a>';
+				print '<a href="'.DOL_URL_ROOT.'/expedition/card.php?id='.$objp->expedition_id.'">'.img_object($langs->trans("ShowSending"), 'sending').' '.$objp->exp_ref.'<a>';
 				print '</td>';
 
 				// Description
 				if ($objp->fk_product > 0)
 				{
 					// Define output language
-					if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+					if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
 					{
 						$object = new $origin($db);
 						$object->fetch($origin_id);
 						$object->fetch_thirdparty();
 
 						$prod = new Product($db);
-						$prod->id=$objp->fk_product;
+						$prod->id = $objp->fk_product;
 						$prod->getMultiLangs();
 
 						$outputlangs = $langs;
-						$newlang='';
-						if (empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
-						if (empty($newlang)) $newlang=$object->thirdparty->default_lang;
-						if (! empty($newlang))
+						$newlang = '';
+						if (empty($newlang) && !empty($_REQUEST['lang_id'])) $newlang = $_REQUEST['lang_id'];
+						if (empty($newlang)) $newlang = $object->thirdparty->default_lang;
+						if (!empty($newlang))
 						{
-							$outputlangs = new Translate("",$conf);
+							$outputlangs = new Translate("", $conf);
 							$outputlangs->setDefaultLang($newlang);
 						}
 
-						$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
+						$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
 					}
 					else
 					{
-						$label = (! empty($objp->label)?$objp->label:$objp->product_label);
+						$label = (!empty($objp->label) ? $objp->label : $objp->product_label);
 					}
 
 					print '<td>';
 
 					// Show product and description
-					$product_static->type=$objp->fk_product_type;
-					$product_static->id=$objp->fk_product;
-					$product_static->ref=$objp->ref;
-					$product_static->status_batch=$objp->product_tobatch;
-					$text=$product_static->getNomUrl(1);
-					$text.= ' - '.$label;
-					$description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($objp->description));
-					print $form->textwithtooltip($text,$description,3,'','',$i);
+					$product_static->type = $objp->fk_product_type;
+					$product_static->id = $objp->fk_product;
+					$product_static->ref = $objp->ref;
+					$product_static->status_batch = $objp->product_tobatch;
+					$text = $product_static->getNomUrl(1);
+					$text .= ' - '.$label;
+					$description = (!empty($conf->global->PRODUIT_DESC_IN_FORM) ? '' : dol_htmlentitiesbr($objp->description));
+					print $form->textwithtooltip($text, $description, 3, '', '', $i);
 
 					// Show range
-					print_date_range($objp->date_start,$objp->date_end);
+					print_date_range($objp->date_start, $objp->date_end);
 
 					// Add description in form
-					if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
+					if (!empty($conf->global->PRODUIT_DESC_IN_FORM))
 					{
-						print (! empty($objp->description) && $objp->description!=$objp->product)?'<br>'.dol_htmlentitiesbr($objp->description):'';
+						print (!empty($objp->description) && $objp->description != $objp->product) ? '<br>'.dol_htmlentitiesbr($objp->description) : '';
 					}
 
 					print '</td>';
@@ -309,34 +309,34 @@ 
 				else
 				{
 					print "<td>";
-					if ($objp->fk_product_type==1) $text = img_object($langs->trans('Service'),'service');
-					else $text = img_object($langs->trans('Product'),'product');
+					if ($objp->fk_product_type == 1) $text = img_object($langs->trans('Service'), 'service');
+					else $text = img_object($langs->trans('Product'), 'product');
 
-					if (! empty($objp->label)) {
-						$text.= ' <strong>'.$objp->label.'</strong>';
-						print $form->textwithtooltip($text,$objp->description,3,'','',$i);
+					if (!empty($objp->label)) {
+						$text .= ' <strong>'.$objp->label.'</strong>';
+						print $form->textwithtooltip($text, $objp->description, 3, '', '', $i);
 					} else {
 						print $text.' '.nl2br($objp->description);
 					}
 
 					// Show range
-					print_date_range($objp->date_start,$objp->date_end);
+					print_date_range($objp->date_start, $objp->date_end);
 					print "</td>\n";
 				}
 
 				//print '<td align="center">'.$objp->qty_asked.'</td>';
 
 				// Date creation
-				print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($objp->date_creation),'day').'</td>';
+				print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($objp->date_creation), 'day').'</td>';
 
 				// Date shipping creation
-				print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($objp->date_delivery),'day').'</td>';
+				print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($objp->date_delivery), 'day').'</td>';
 
 				// Qty shipped
 				print '<td align="center">'.$objp->qty_shipped.'</td>';
 
 				// Warehouse
-				if (! empty($conf->stock->enabled))
+				if (!empty($conf->stock->enabled))
 				{
 				    print '<td>';
     				if ($objp->warehouse_id > 0)
@@ -380,17 +380,17 @@ 
 				}*/
 
 				// Informations on receipt
-				if (! empty($conf->livraison_bon->enabled))
+				if (!empty($conf->livraison_bon->enabled))
 				{
 					include_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php';
-					$expedition->id=$objp->sendingid;
-					$expedition->fetchObjectLinked($expedition->id,$expedition->element);
+					$expedition->id = $objp->sendingid;
+					$expedition->fetchObjectLinked($expedition->id, $expedition->element);
 					//var_dump($expedition->linkedObjects);
 
-					$receiving='';
-					if (count($expedition->linkedObjects['delivery']) > 0) $receiving=reset($expedition->linkedObjects['delivery']);   // Take first link
+					$receiving = '';
+					if (count($expedition->linkedObjects['delivery']) > 0) $receiving = reset($expedition->linkedObjects['delivery']); // Take first link
 
-					if (! empty($receiving))
+					if (!empty($receiving))
 					{
 						// $expedition->fk_origin_line = id of det line of order
 						// $receiving->fk_origin_line = id of det line of order
@@ -410,7 +410,7 @@ 
 						//print '</td>';
 						// Date shipping real
 						print '<td align="right">';
-						print dol_print_date($receiving->date_delivery,'day');
+						print dol_print_date($receiving->date_delivery, 'day');
 						print '</td>';
 					}
 					else

dolibarr/htdocs/core/lib/reception.lib.php

Spacing +7 added lines, -7 removed lines

@@ -57,10 +57,10 @@ 
 	        $objectsrc = new Commande($db);
 	        $objectsrc->fetch($object->origin_id);
 	    }
-	    $nbContact = count($objectsrc->liste_contact(-1,'internal')) + count($objectsrc->liste_contact(-1,'external'));
+	    $nbContact = count($objectsrc->liste_contact(-1, 'internal')) + count($objectsrc->liste_contact(-1, 'external'));
 	    $head[$h][0] = DOL_URL_ROOT."/reception/contact.php?id=".$object->id;
     	$head[$h][1] = $langs->trans("ContactsAddresses");
-		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+		if ($nbContact > 0) $head[$h][1] .= ' <span class="badge">'.$nbContact.'</span>';
     	$head[$h][2] = 'contact';
     	$h++;
 	}
@@ -70,7 +70,7 @@ 
     if (!empty($object->note_public)) $nbNote++;
 	$head[$h][0] = DOL_URL_ROOT."/reception/note.php?id=".$object->id;
 	$head[$h][1] = $langs->trans("Notes");
-	if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+	if ($nbNote > 0) $head[$h][1] .= ' <span class="badge">'.$nbNote.'</span>';
 	$head[$h][2] = 'note';
 	$h++;
 	
@@ -79,7 +79,7 @@ 
 
 	
 
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'order','remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'order', 'remove');
 
     return $head;
 }
@@ -103,7 +103,7 @@ 
 	$h++;
 
 	
-	if (! empty($conf->global->MAIN_SUBMODULE_RECEPTION))
+	if (!empty($conf->global->MAIN_SUBMODULE_RECEPTION))
 	{
 	$head[$h][0] = DOL_URL_ROOT.'/admin/reception_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
@@ -111,7 +111,7 @@ 
 	$h++;
 	}
 	
-	if (! empty($conf->global->MAIN_SUBMODULE_RECEPTION))
+	if (!empty($conf->global->MAIN_SUBMODULE_RECEPTION))
 	{
 	$head[$h][0] = DOL_URL_ROOT.'/admin/commande_fournisseur_dispatch_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFieldsLines");
@@ -121,7 +121,7 @@ 
 	
 	
 	
-	complete_head_from_modules($conf,$langs,null,$head,$h,'reception_admin','remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'reception_admin', 'remove');
 
 	return $head;
 }

dolibarr/htdocs/core/lib/expensereport.lib.php

Spacing +15 added lines, -15 removed lines

@@ -34,7 +34,7 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/expensereport/card.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/expensereport/card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
 	$h++;
@@ -43,37 +43,37 @@ 
 	// Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'expensereport');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'expensereport');
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->expensereport->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
-    $nbLinks=Link::count($db, $object->element, $object->id);
+	$upload_dir = $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+    $nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/expensereport/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ' <span class="badge">'.($nbFiles + $nbLinks).'</span>';
 	$head[$h][2] = 'documents';
 	$h++;
 
 	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 	{
 	    $nbNote = 0;
-	    if(!empty($object->note_private)) $nbNote++;
-	    if(!empty($object->note_public)) $nbNote++;
+	    if (!empty($object->note_private)) $nbNote++;
+	    if (!empty($object->note_public)) $nbNote++;
 	    $head[$h][0] = DOL_URL_ROOT.'/expensereport/note.php?id='.$object->id;
 	    $head[$h][1] = $langs->trans('Notes');
-	    if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+	    if ($nbNote > 0) $head[$h][1] .= ' <span class="badge">'.$nbNote.'</span>';
 	    $head[$h][2] = 'note';
 	    $h++;
 	}
 
-	$head[$h][0] = DOL_URL_ROOT . '/expensereport/info.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/expensereport/info.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Info");
 	$head[$h][2] = 'info';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'expensereport','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'expensereport', 'remove');
 
 	return $head;
 }
@@ -102,14 +102,14 @@ 
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'payment_expensereport');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment_expensereport');
 
 	$head[$h][0] = DOL_URL_ROOT.'/expensereport/payment/info.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Info");
 	$head[$h][2] = 'info';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'payment_expensereport', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment_expensereport', 'remove');
 
 	return $head;
 }
@@ -153,7 +153,7 @@ 
 	// Entries must be declared in modules descriptor with line
 	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
 	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-	complete_head_from_modules($conf,$langs,null,$head,$h,'expensereport_admin');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'expensereport_admin');
 
 	$head[$h][0] = DOL_URL_ROOT.'/admin/expensereport_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
@@ -167,7 +167,7 @@ 
     $h++;
 	*/
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'expensereport_admin','remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'expensereport_admin', 'remove');
 
     return $head;
 }