Scrutinizer Auto-Fixes

This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2026-01-06 17:13:03 +01:00 · 2019-11-13 18:35:02 +00:00
parent 545c2207b2
commit 8a527631a0
108 changed files with 11097 additions and 11098 deletions
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -36,12 +36,12 @@ $langs->loadLangs(array('companies', 'products', 'admin', 'sms', 'other', 'error

 if (!$user->admin) accessforbidden();

-$id=GETPOST('rowid', 'int');
-$action=GETPOST('action', 'alpha');
+$id = GETPOST('rowid', 'int');
+$action = GETPOST('action', 'alpha');

-$mode = GETPOST('mode', 'aZ09')?GETPOST('mode', 'aZ09'):'createform';   // 'createform', 'filters', 'sortorder', 'focus'
+$mode = GETPOST('mode', 'aZ09') ?GETPOST('mode', 'aZ09') : 'createform'; // 'createform', 'filters', 'sortorder', 'focus'

-$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOST("page", 'int');
@@ -49,32 +49,32 @@ if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined,
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortfield) $sortfield='page,param';
-if (! $sortorder) $sortorder='ASC';
+if (!$sortfield) $sortfield = 'page,param';
+if (!$sortorder) $sortorder = 'ASC';

 $defaulturl = GETPOST('defaulturl');
 $defaultkey = GETPOST('defaultkey', 'alpha');
 $defaultvalue = GETPOST('defaultvalue');

-$defaulturl=preg_replace('/^\//', '', $defaulturl);
+$defaulturl = preg_replace('/^\//', '', $defaulturl);

 $urlpage = GETPOST('urlpage');
 $key = GETPOST('key');
 $value = GETPOST('value');

 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('admindefaultvalues','globaladmin'));
+$hookmanager->initHooks(array('admindefaultvalues', 'globaladmin'));


 /*
 * Actions
 */

-if (GETPOST('cancel', 'alpha')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
+if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }

-$parameters=array('socid'=>$socid);
-$reshook=$hookmanager->executeHooks('doActions', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array('socid'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

 include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
@@ -82,11 +82,11 @@ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 // Purge search criteria
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
-    $defaulturl='';
-    $defaultkey='';
-    $defaultvalue='';
-    $toselect='';
-    $search_array_options=array();
+    $defaulturl = '';
+    $defaultkey = '';
+    $defaultvalue = '';
+    $toselect = '';
+    $search_array_options = array();
 }

 if ($action == 'setMAIN_ENABLE_DEFAULT_VALUES')
@@ -97,7 +97,7 @@ if ($action == 'setMAIN_ENABLE_DEFAULT_VALUES')

 if (($action == 'add' || (GETPOST('add') && $action != 'update')) || GETPOST('actionmodify'))
 {
-	$error=0;
+	$error = 0;

 	if (($action == 'add' || (GETPOST('add') && $action != 'update')))
 	{
@@ -126,7 +126,7 @@ if (($action == 'add' || (GETPOST('add') && $action != 'update')) || GETPOST('ac
 	    }
 	}

-	if (! $error)
+	if (!$error)
 	{
 	    $db->begin();

@@ -137,7 +137,7 @@ if (($action == 'add' || (GETPOST('add') && $action != 'update')) || GETPOST('ac
 	    if (GETPOST('actionmodify'))
 	    {
 		    $sql = "UPDATE ".MAIN_DB_PREFIX."default_values SET page = '".$db->escape($urlpage)."', param = '".$db->escape($key)."', value = '".$db->escape($value)."'";
-		    $sql.= " WHERE rowid = ".$id;
+		    $sql .= " WHERE rowid = ".$id;
 	    }

 		$result = $db->query($sql);
@@ -145,16 +145,16 @@ if (($action == 'add' || (GETPOST('add') && $action != 'update')) || GETPOST('ac
 		{
 		    $db->commit();
 			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-			$action="";
-			$defaulturl='';
-			$defaultkey='';
-			$defaultvalue='';
+			$action = "";
+			$defaulturl = '';
+			$defaultkey = '';
+			$defaultvalue = '';
 		}
 		else
 		{
 	        $db->rollback();
 		    setEventMessages($db->lasterror(), null, 'errors');
-			$action='';
+			$action = '';
 		}
 	}
 }
@@ -181,28 +181,28 @@ if ($action == 'delete')
 * View
 */

-$form=new Form($db);
+$form = new Form($db);
 $formadmin = new FormAdmin($db);

-$wikihelp='EN:Setup|FR:Paramétrage|ES:Configuración';
+$wikihelp = 'EN:Setup|FR:Paramétrage|ES:Configuración';
 llxHeader('', $langs->trans("Setup"), $wikihelp);

-$param='&mode='.$mode;
+$param = '&mode='.$mode;

-$enabledisablehtml.= $langs->trans("EnableDefaultValues").' ';
+$enabledisablehtml .= $langs->trans("EnableDefaultValues").' ';
 if (empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))
 {
    // Button off, click to enable
-    $enabledisablehtml.= '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&value=1'.$param.'">';
-    $enabledisablehtml.= img_picto($langs->trans("Disabled"), 'switch_off');
-    $enabledisablehtml.= '</a>';
+    $enabledisablehtml .= '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&value=1'.$param.'">';
+    $enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
+    $enabledisablehtml .= '</a>';
 }
 else
 {
    // Button on, click to disable
-    $enabledisablehtml.= '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&value=0'.$param.'">';
-    $enabledisablehtml.= img_picto($langs->trans("Activated"), 'switch_on');
-    $enabledisablehtml.= '</a>';
+    $enabledisablehtml .= '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&value=0'.$param.'">';
+    $enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
+    $enabledisablehtml .= '</a>';
 }

 print load_fiche_titre($langs->trans("DefaultValues"), $enabledisablehtml, 'title_setup');
@@ -210,15 +210,15 @@ print load_fiche_titre($langs->trans("DefaultValues"), $enabledisablehtml, 'titl
 print '<span class="opacitymedium">'.$langs->trans("DefaultValuesDesc")."</span><br>\n";
 print "<br>\n";

-if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-if ($optioncss != '')  $param.='&optioncss='.$optioncss;
-if ($defaulturl)        $param.='&defaulturl='.urlencode($defaulturl);
-if ($defaultkey)        $param.='&defaultkey='.urlencode($defaultkey);
-if ($defaultvalue)      $param.='&defaultvalue='.urlencode($defaultvalue);
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+if ($optioncss != '')  $param .= '&optioncss='.$optioncss;
+if ($defaulturl)        $param .= '&defaulturl='.urlencode($defaulturl);
+if ($defaultkey)        $param .= '&defaultkey='.urlencode($defaultkey);
+if ($defaultvalue)      $param .= '&defaultvalue='.urlencode($defaultvalue);


-print '<form action="'.$_SERVER["PHP_SELF"].((empty($user->entity) && $debug)?'?debug=1':'').'" method="POST">';
+print '<form action="'.$_SERVER["PHP_SELF"].((empty($user->entity) && $debug) ? '?debug=1' : '').'" method="POST">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
@@ -227,7 +227,7 @@ print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';

-$head=defaultvalues_prepare_head();
+$head = defaultvalues_prepare_head();

 dol_fiche_head($head, $mode, '', -1, '');

@@ -248,22 +248,22 @@ print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 // Page
-$texthelp=$langs->trans("PageUrlForDefaultValues");
-if ($mode == 'createform') $texthelp.=$langs->trans("PageUrlForDefaultValuesCreate", 'societe/card.php', 'societe/card.php?abc=val1&def=val2');
-else $texthelp.=$langs->trans("PageUrlForDefaultValuesList", 'societe/list.php', 'societe/list.php?abc=val1&def=val2');
-$texthelp.='<br><br>'.$langs->trans("AlsoDefaultValuesAreEffectiveForActionCreate");
-$texturl=$form->textwithpicto($langs->trans("Url"), $texthelp);
+$texthelp = $langs->trans("PageUrlForDefaultValues");
+if ($mode == 'createform') $texthelp .= $langs->trans("PageUrlForDefaultValuesCreate", 'societe/card.php', 'societe/card.php?abc=val1&def=val2');
+else $texthelp .= $langs->trans("PageUrlForDefaultValuesList", 'societe/list.php', 'societe/list.php?abc=val1&def=val2');
+$texthelp .= '<br><br>'.$langs->trans("AlsoDefaultValuesAreEffectiveForActionCreate");
+$texturl = $form->textwithpicto($langs->trans("Url"), $texthelp);
 print_liste_field_titre($texturl, $_SERVER["PHP_SELF"], 'page,param', '', $param, '', $sortfield, $sortorder);
 // Field
-$texthelp=$langs->trans("TheKeyIsTheNameOfHtmlField");
+$texthelp = $langs->trans("TheKeyIsTheNameOfHtmlField");
 if ($mode != 'sortorder')
 {
-    $textkey=$form->textwithpicto($langs->trans("Field"), $texthelp);
+    $textkey = $form->textwithpicto($langs->trans("Field"), $texthelp);
 }
 else
 {
-    $texthelp='field or alias.field';
-    $textkey=$form->textwithpicto($langs->trans("Field"), $texthelp);
+    $texthelp = 'field or alias.field';
+    $textkey = $form->textwithpicto($langs->trans("Field"), $texthelp);
 }
 print_liste_field_titre($textkey, $_SERVER["PHP_SELF"], 'param', '', $param, '', $sortfield, $sortorder);
 // Value
@@ -271,24 +271,24 @@ if ($mode != 'focus' && $mode != 'mandatory')
 {
    if ($mode != 'sortorder')
    {
-        $substitutionarray=getCommonSubstitutionArray($langs, 2, array('object','objectamount')); // Must match list into GETPOST
+        $substitutionarray = getCommonSubstitutionArray($langs, 2, array('object', 'objectamount')); // Must match list into GETPOST
 		unset($substitutionarray['__USER_SIGNATURE__']);
-        $texthelp=$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
-        foreach($substitutionarray as $key => $val)
+        $texthelp = $langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
+        foreach ($substitutionarray as $key => $val)
        {
-            $texthelp.=$key.' -> '.$val.'<br>';
+            $texthelp .= $key.' -> '.$val.'<br>';
        }
-        $textvalue=$form->textwithpicto($langs->trans("Value"), $texthelp, 1, 'help', '', 0, 2, 'subsitutiontooltip');
+        $textvalue = $form->textwithpicto($langs->trans("Value"), $texthelp, 1, 'help', '', 0, 2, 'subsitutiontooltip');
    }
    else
    {
-        $texthelp='ASC or DESC';
-        $textvalue=$form->textwithpicto($langs->trans("SortOrder"), $texthelp);
+        $texthelp = 'ASC or DESC';
+        $textvalue = $form->textwithpicto($langs->trans("SortOrder"), $texthelp);
    }
    print_liste_field_titre($textvalue, $_SERVER["PHP_SELF"], 'value', '', $param, '', $sortfield, $sortorder);
 }
 // Entity
-if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], 'entity,page', '', $param, '', $sortfield, $sortorder);
+if (!empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], 'entity,page', '', $param, '', $sortfield, $sortorder);
 else print_liste_field_titre("", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
 // Actions
 print_liste_field_titre("", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
@@ -315,10 +315,10 @@ if ($mode != 'focus' && $mode != 'mandatory')
    print '</td>';
 }
 // Limit to superadmin
-if (! empty($conf->multicompany->enabled) && !$user->entity)
+if (!empty($conf->multicompany->enabled) && !$user->entity)
 {
 	print '<td>';
-	print '<input type="text" class="flat" size="1" disabled name="entity" value="'.$conf->entity.'">';	// We see environment, but to change it we must switch on other entity
+	print '<input type="text" class="flat" size="1" disabled name="entity" value="'.$conf->entity.'">'; // We see environment, but to change it we must switch on other entity
 	print '</td>';
 }
 else
@@ -328,8 +328,8 @@ else
 	print '</td>';
 }
 print '<td class="center">';
-$disabled='';
-if (empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES)) $disabled=' disabled="disabled"';
+$disabled = '';
+if (empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES)) $disabled = ' disabled="disabled"';
 print '<input type="submit" class="button"'.$disabled.' value="'.$langs->trans("Add").'" name="add">';
 print "</td>\n";
 print '</tr>';
@@ -337,10 +337,10 @@ print '</tr>';

 // Show constants
 $sql = "SELECT rowid, entity, type, page, param, value";
-$sql.= " FROM ".MAIN_DB_PREFIX."default_values";
-$sql.= " WHERE type = '".$db->escape($mode)."'";
-$sql.= " AND entity IN (".$user->entity.",".$conf->entity.")";
-$sql.= $db->order($sortfield, $sortorder);
+$sql .= " FROM ".MAIN_DB_PREFIX."default_values";
+$sql .= " WHERE type = '".$db->escape($mode)."'";
+$sql .= " AND entity IN (".$user->entity.",".$conf->entity.")";
+$sql .= $db->order($sortfield, $sortorder);

 dol_syslog("translation::select from table", LOG_DEBUG);
 $result = $db->query($sql);
@@ -389,15 +389,15 @@ if ($result)
 		print '<td class="center">';
 		if ($action != 'edit' || GETPOST('rowid') != $obj->rowid)
 		{
-    		print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.$mode.'&action=edit'.((empty($user->entity) && $debug)?'&debug=1':'').'">'.img_edit().'</a>';
+    		print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.$mode.'&action=edit'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_edit().'</a>';
    		print ' &nbsp; ';
-    		print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.$mode.'&action=delete'.((empty($user->entity) && $debug)?'&debug=1':'').'">'.img_delete().'</a>';
+    		print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.$mode.'&action=delete'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_delete().'</a>';
 		}
 		else
 		{
 		    print '<input type="hidden" name="page" value="'.$page.'">';
 		    print '<input type="hidden" name="rowid" value="'.$id.'">';
-		    print '<div name="'.(! empty($obj->rowid)?$obj->rowid:'none').'"></div>';
+		    print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : 'none').'"></div>';
 		    print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
 		    print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
 		}