Inspection of "Daily Inspection: Qual: The color selector use the..." - Dolibarr/dolibarr - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Branch — develop (f9de28)

unknown

created 2024-01-27 16:32 UTC

Status

Spacing +75 added lines, -75 removed lines patch added patch discarded remove patch

@@ -154,15 +154,15 @@  discard block
 block discarded – undo
 			return $hookmanager->resPrint;
 		} else {
 			$out = '<!-- Start generateOutput from FormSetup class  -->';
-			$out.= $this->htmlBeforeOutputForm;
+			$out .= $this->htmlBeforeOutputForm;
 
 			if ($editMode) {
-				$out.= '<form ' . self::generateAttributesStringFromArray($this->formAttributes) . ' >';
+				$out .= '<form '.self::generateAttributesStringFromArray($this->formAttributes).' >';
 
 				// generate hidden values from $this->formHiddenInputs
 				if (!empty($this->formHiddenInputs) && is_array($this->formHiddenInputs)) {
 					foreach ($this->formHiddenInputs as $hiddenKey => $hiddenValue) {
-						$out.= '<input type="hidden" name="'.dol_escape_htmltag($hiddenKey).'" value="' . dol_escape_htmltag($hiddenValue) . '">';
+						$out .= '<input type="hidden" name="'.dol_escape_htmltag($hiddenKey).'" value="'.dol_escape_htmltag($hiddenValue).'">';
 					}
 				}
 			}
@@ -180,8 +180,8 @@  discard block
 block discarded – undo
 				return $hookmanager->resPrint;
 			} elseif ($editMode) {
 				$out .= '<div class="form-setup-button-container center">'; // Todo : remove .center by adding style to form-setup-button-container css class in all themes
-				$out.= $this->htmlOutputMoreButton;
-				$out .= '<input class="button button-save" type="submit" value="' . $this->langs->trans("Save") . '">'; // Todo fix dolibarr style for <button and use <button instead of input
+				$out .= $this->htmlOutputMoreButton;
+				$out .= '<input class="button button-save" type="submit" value="'.$this->langs->trans("Save").'">'; // Todo fix dolibarr style for <button and use <button instead of input
 				/*$out .= ' &nbsp;&nbsp; ';
 				$out .= '<a class="button button-cancel" type="submit" href="' . $this->formAttributes['action'] . '">'.$this->langs->trans('Cancel').'</a>';
 				*/
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
 				$out .= '</form>';
 			}
 
-			$out.= $this->htmlAfterOutputForm;
+			$out .= $this->htmlAfterOutputForm;
 
 			return $out;
 		}
@@ -225,8 +225,8 @@  discard block
 block discarded – undo
 			if (empty($hideTitle)) {
 				$out .= '<thead>';
 				$out .= '<tr class="liste_titre">';
-				$out .= '	<td>' . $this->langs->trans("Parameter") . '</td>';
-				$out .= '	<td>' . $this->langs->trans("Value") . '</td>';
+				$out .= '	<td>'.$this->langs->trans("Parameter").'</td>';
+				$out .= '	<td>'.$this->langs->trans("Value").'</td>';
 				$out .= '</tr>';
 				$out .= '</thead>';
 			}
@@ -312,27 +312,27 @@  discard block
 block discarded – undo
 	public function generateLineOutput($item, $editMode = false)
 	{
 		$out = '';
-		if ($item->enabled==1) {
+		if ($item->enabled == 1) {
 			$trClass = 'oddeven';
 			if ($item->getType() == 'title') {
 				$trClass = 'liste_titre';
 			}
 
 			$this->setupNotEmpty++;
-			$out.= '<tr class="'.$trClass.'">';
+			$out .= '<tr class="'.$trClass.'">';
 
-			$out.= '<td class="col-setup-title">';
-			$out.= '<span id="helplink'.$item->confKey.'" class="spanforparamtooltip">';
-			$out.= $this->form->textwithpicto($item->getNameText(), $item->getHelpText(), 1, 'info', '', 0, 3, 'tootips'.$item->confKey);
-			$out.= '</span>';
-			$out.= '</td>';
+			$out .= '<td class="col-setup-title">';
+			$out .= '<span id="helplink'.$item->confKey.'" class="spanforparamtooltip">';
+			$out .= $this->form->textwithpicto($item->getNameText(), $item->getHelpText(), 1, 'info', '', 0, 3, 'tootips'.$item->confKey);
+			$out .= '</span>';
+			$out .= '</td>';
 
-			$out.= '<td>';
+			$out .= '<td>';
 
 			if ($editMode) {
-				$out.= $item->generateInputField();
+				$out .= $item->generateInputField();
 			} else {
-				$out.= $item->generateOutputField();
+				$out .= $item->generateOutputField();
 			}
 
 			if (!empty($item->errors)) {
@@ -340,8 +340,8 @@  discard block
 block discarded – undo
 				setEventMessages(null, $item->errors, 'errors');
 			}
 
-			$out.= '</td>';
-			$out.= '</tr>';
+			$out .= '</td>';
+			$out .= '</tr>';
 		}
 
 		return $out;
@@ -812,7 +812,7 @@  discard block
 block discarded – undo
 		if (!empty($this->helpText)) {
 			return $this->helpText;
 		}
-		return (($this->langs->trans($this->confKey . 'Tooltip') != $this->confKey . 'Tooltip') ? $this->langs->trans($this->confKey . 'Tooltip') : '');
+		return (($this->langs->trans($this->confKey.'Tooltip') != $this->confKey.'Tooltip') ? $this->langs->trans($this->confKey.'Tooltip') : '');
 	}
 
 	/**
@@ -858,47 +858,47 @@  discard block
 block discarded – undo
 		$out = '';
 
 		if ($this->type == 'title') {
-			$out.= $this->generateOutputField(); // title have no input
+			$out .= $this->generateOutputField(); // title have no input
 		} elseif ($this->type == 'multiselect') {
-			$out.= $this->generateInputFieldMultiSelect();
+			$out .= $this->generateInputFieldMultiSelect();
 		} elseif ($this->type == 'select') {
-			$out.= $this->generateInputFieldSelect();
+			$out .= $this->generateInputFieldSelect();
 		} elseif ($this->type == 'selectUser') {
-			$out.= $this->generateInputFieldSelectUser();
+			$out .= $this->generateInputFieldSelectUser();
 		} elseif ($this->type == 'textarea') {
-			$out.= $this->generateInputFieldTextarea();
-		} elseif ($this->type== 'html') {
-			$out.= $this->generateInputFieldHtml();
-		} elseif ($this->type== 'color') {
-			$out.=  $this->generateInputFieldColor();
+			$out .= $this->generateInputFieldTextarea();
+		} elseif ($this->type == 'html') {
+			$out .= $this->generateInputFieldHtml();
+		} elseif ($this->type == 'color') {
+			$out .= $this->generateInputFieldColor();
 		} elseif ($this->type == 'yesno') {
 			if (!empty($conf->use_javascript_ajax)) {
-				$out.= ajax_constantonoff($this->confKey);
+				$out .= ajax_constantonoff($this->confKey);
 			} else {
-				$out.= $this->form->selectyesno($this->confKey, $this->fieldValue, 1);
+				$out .= $this->form->selectyesno($this->confKey, $this->fieldValue, 1);
 			}
 		} elseif (preg_match('/emailtemplate:/', $this->type)) {
-			$out.= $this->generateInputFieldEmailTemplate();
+			$out .= $this->generateInputFieldEmailTemplate();
 		} elseif (preg_match('/category:/', $this->type)) {
-			$out.=$this->generateInputFieldCategories();
+			$out .= $this->generateInputFieldCategories();
 		} elseif (preg_match('/thirdparty_type/', $this->type)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 			$formcompany = new FormCompany($this->db);
-			$out.= $formcompany->selectProspectCustomerType($this->fieldValue, $this->confKey);
+			$out .= $formcompany->selectProspectCustomerType($this->fieldValue, $this->confKey);
 		} elseif ($this->type == 'securekey') {
-			$out.= $this->generateInputFieldSecureKey();
+			$out .= $this->generateInputFieldSecureKey();
 		} elseif ($this->type == 'product') {
 			if (isModEnabled("product") || isModEnabled("service")) {
 				$selected = (empty($this->fieldValue) ? '' : $this->fieldValue);
-				$out.= $this->form->select_produits($selected, $this->confKey, '', 0, 0, 1, 2, '', 0, array(), 0, '1', 0, $this->cssClass, 0, '', null, 1);
+				$out .= $this->form->select_produits($selected, $this->confKey, '', 0, 0, 1, 2, '', 0, array(), 0, '1', 0, $this->cssClass, 0, '', null, 1);
 			}
 		} elseif ($this->type == 'selectBankAccount') {
 			if (isModEnabled("bank")) {
 				$selected = (empty($this->fieldValue) ? '' : $this->fieldValue);
-				$out.= $this->form->select_comptes($selected, $this->confKey, 0, '', 0, '', 0, '', 1);
+				$out .= $this->form->select_comptes($selected, $this->confKey, 0, '', 0, '', 0, '', 1);
 			}
 		} else {
-			$out.= $this->generateInputFieldText();
+			$out .= $this->generateInputFieldText();
 		}
 
 		return $out;
@@ -924,9 +924,9 @@  discard block
 block discarded – undo
 	 */
 	public function generateInputFieldTextarea()
 	{
-		$out = '<textarea class="flat" name="'.$this->confKey.'" id="'.$this->confKey.'" cols="50" rows="5" wrap="soft">' . "\n";
-		$out.= dol_htmlentities($this->fieldValue);
-		$out.= "</textarea>\n";
+		$out = '<textarea class="flat" name="'.$this->confKey.'" id="'.$this->confKey.'" cols="50" rows="5" wrap="soft">'."\n";
+		$out .= dol_htmlentities($this->fieldValue);
+		$out .= "</textarea>\n";
 		return $out;
 	}
 
@@ -938,7 +938,7 @@  discard block
 block discarded – undo
 	public function generateInputFieldHtml()
 	{
 		global $conf;
-		require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 		$doleditor = new DolEditor($this->confKey, $this->fieldValue, '', 160, 'dolibarr_notes', '', false, false, isModEnabled('fckeditor'), ROWS_5, '90%');
 		return $doleditor->Create(1);
 	}
@@ -976,7 +976,7 @@  discard block
 block discarded – undo
 
 		$out = '';
 		if (preg_match('/emailtemplate:/', $this->type)) {
-			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 			$formmail = new FormMail($this->db);
 
 			$tmp = explode(':', $this->type);
@@ -986,10 +986,10 @@  discard block
 block discarded – undo
 				foreach ($formmail->lines_model as $modelMail) {
 					$moreonlabel = '';
 					if (!empty($arrayOfMessageName[$modelMail->label])) {
-						$moreonlabel = ' <span class="opacitymedium">(' . $this->langs->trans("SeveralLangugeVariatFound") . ')</span>';
+						$moreonlabel = ' <span class="opacitymedium">('.$this->langs->trans("SeveralLangugeVariatFound").')</span>';
 					}
 					// The 'label' is the key that is unique if we exclude the language
-					$arrayOfMessageName[$modelMail->id] = $this->langs->trans(preg_replace('/\(|\)/', '', $modelMail->label)) . $moreonlabel;
+					$arrayOfMessageName[$modelMail->id] = $this->langs->trans(preg_replace('/\(|\)/', '', $modelMail->label)).$moreonlabel;
 				}
 			}
 			$out .= $this->form->selectarray($this->confKey, $arrayOfMessageName, $this->fieldValue, 'None', 0, 0, '', 0, 0, 0, '', '', 1);
@@ -1009,7 +1009,7 @@  discard block
 block discarded – undo
 		global $conf;
 		$out = '<input required="required" type="text" class="flat" id="'.$this->confKey.'" name="'.$this->confKey.'" value="'.(GETPOST($this->confKey, 'alpha') ? GETPOST($this->confKey, 'alpha') : $this->fieldValue).'" size="40">';
 		if (!empty($conf->use_javascript_ajax)) {
-			$out.= '&nbsp;'.img_picto($this->langs->trans('Generate'), 'refresh', 'id="generate_token'.$this->confKey.'" class="linkobject"');
+			$out .= '&nbsp;'.img_picto($this->langs->trans('Generate'), 'refresh', 'id="generate_token'.$this->confKey.'" class="linkobject"');
 		}
 
 		// Add button to autosuggest a key
@@ -1124,30 +1124,30 @@  discard block
 block discarded – undo
 		if ($this->type == 'title') {
 			// nothing to do
 		} elseif ($this->type == 'textarea') {
-			$out.= dol_nl2br($this->fieldValue);
+			$out .= dol_nl2br($this->fieldValue);
 		} elseif ($this->type == 'multiselect') {
-			$out.= $this->generateOutputFieldMultiSelect();
+			$out .= $this->generateOutputFieldMultiSelect();
 		} elseif ($this->type == 'select') {
-			$out.= $this->generateOutputFieldSelect();
+			$out .= $this->generateOutputFieldSelect();
 		} elseif ($this->type == 'selectUser') {
-			$out.= $this->generateOutputFieldSelectUser();
+			$out .= $this->generateOutputFieldSelectUser();
 		} elseif ($this->type == 'html') {
-			$out.=  $this->fieldValue;
+			$out .= $this->fieldValue;
 		} elseif ($this->type == 'color') {
-			$out.=  $this->generateOutputFieldColor();
+			$out .= $this->generateOutputFieldColor();
 		} elseif ($this->type == 'yesno') {
 			if (!empty($conf->use_javascript_ajax)) {
-				$out.= ajax_constantonoff($this->confKey);
+				$out .= ajax_constantonoff($this->confKey);
 			} else {
 				if ($this->fieldValue == 1) {
-					$out.= $langs->trans('yes');
+					$out .= $langs->trans('yes');
 				} else {
-					$out.= $langs->trans('no');
+					$out .= $langs->trans('no');
 				}
 			}
 		} elseif (preg_match('/emailtemplate:/', $this->type)) {
 			if ($this->fieldValue > 0) {
-				include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
+				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 				$formmail = new FormMail($this->db);
 
 				$tmp = explode(':', $this->type);
@@ -1156,7 +1156,7 @@  discard block
 block discarded – undo
 				if (is_numeric($template) && $template < 0) {
 					$this->setErrors($formmail->errors);
 				}
-				$out.= $this->langs->trans($template->label);
+				$out .= $this->langs->trans($template->label);
 			}
 		} elseif (preg_match('/category:/', $this->type)) {
 			require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
@@ -1168,18 +1168,18 @@  discard block
 block discarded – undo
 			$ways = $c->print_all_ways(' &gt;&gt; ', 'none', 0, 1); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formatted text
 			$toprint = array();
 			foreach ($ways as $way) {
-				$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"' . ($c->color ? ' style="background: #' . $c->color . ';"' : ' style="background: #bbb"') . '>' . $way . '</li>';
+				$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"'.($c->color ? ' style="background: #'.$c->color.';"' : ' style="background: #bbb"').'>'.$way.'</li>';
 			}
-			$out.='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
+			$out .= '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 		} elseif (preg_match('/thirdparty_type/', $this->type)) {
-			if ($this->fieldValue==2) {
-				$out.= $this->langs->trans("Prospect");
-			} elseif ($this->fieldValue==3) {
-				$out.= $this->langs->trans("ProspectCustomer");
-			} elseif ($this->fieldValue==1) {
-				$out.= $this->langs->trans("Customer");
-			} elseif ($this->fieldValue==0) {
-				$out.= $this->langs->trans("NorProspectNorCustomer");
+			if ($this->fieldValue == 2) {
+				$out .= $this->langs->trans("Prospect");
+			} elseif ($this->fieldValue == 3) {
+				$out .= $this->langs->trans("ProspectCustomer");
+			} elseif ($this->fieldValue == 1) {
+				$out .= $this->langs->trans("Customer");
+			} elseif ($this->fieldValue == 0) {
+				$out .= $this->langs->trans("NorProspectNorCustomer");
 			}
 		} elseif ($this->type == 'product') {
 			require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
@@ -1187,7 +1187,7 @@  discard block
 block discarded – undo
 			$product = new Product($this->db);
 			$resprod = $product->fetch($this->fieldValue);
 			if ($resprod > 0) {
-				$out.= $product->ref;
+				$out .= $product->ref;
 			} elseif ($resprod < 0) {
 				$this->setErrors($product->errors);
 			}
@@ -1197,12 +1197,12 @@  discard block
 block discarded – undo
 			$bankaccount = new Account($this->db);
 			$resbank = $bankaccount->fetch($this->fieldValue);
 			if ($resbank > 0) {
-				$out.= $bankaccount->label;
+				$out .= $bankaccount->label;
 			} elseif ($resbank < 0) {
 				$this->setErrors($bankaccount->errors);
 			}
 		} else {
-			$out.= $this->fieldValue;
+			$out .= $this->fieldValue;
 		}
 
 		return $out;
@@ -1225,7 +1225,7 @@  discard block
 block discarded – undo
 		if (!empty($TSelected)) {
 			foreach ($TSelected as $selected) {
 				if (!empty($this->fieldOptions[$selected])) {
-					$outPut.= dolGetBadge('', $this->fieldOptions[$selected], 'info').' ';
+					$outPut .= dolGetBadge('', $this->fieldOptions[$selected], 'info').' ';
 				}
 			}
 		}
@@ -1240,7 +1240,7 @@  discard block
 block discarded – undo
 	public function generateOutputFieldColor()
 	{
 		global $langs;
-		$this->fieldAttr['disabled']=null;
+		$this->fieldAttr['disabled'] = null;
 		$color = colorArrayToHex(colorStringToArray($this->fieldValue, array()), '');
 		if ($color) {
 			return '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
@@ -1254,7 +1254,7 @@  discard block
 block discarded – undo
 	 */
 	public function generateInputFieldColor()
 	{
-		$this->fieldAttr['type']= 'color';
+		$this->fieldAttr['type'] = 'color';
 		$default = $this->defaultFieldValue;
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 		$formother = new FormOther($this->db);
@@ -1286,7 +1286,7 @@  discard block
 block discarded – undo
 		$outPut = '';
 		$user = new User($this->db);
 		$user->fetch($this->fieldValue);
-		$outPut = $user->firstname . " "  . $user->lastname;
+		$outPut = $user->firstname." ".$user->lastname;
 		return $outPut;
 	}
 

Please login to merge, or discard this patch.

htdocs/webportal/admin/setup_theme.php 1 patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -24,8 +24,8 @@  discard block
 block discarded – undo
 
 // Load Dolibarr environment
 require_once "../../main.inc.php";
-require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
-require_once DOL_DOCUMENT_ROOT . "/webportal/lib/webportal.lib.php";
+require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
+require_once DOL_DOCUMENT_ROOT."/webportal/lib/webportal.lib.php";
 
 // Translations
 $langs->loadLangs(array("admin", "webportal"));
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
 // Parameters
 $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
-$modulepart = GETPOST('modulepart', 'aZ09');    // Used by actions_setmoduleoptions.inc.php
+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
 
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
@@ -54,12 +54,12 @@  discard block
 block discarded – undo
 $useFormSetup = 1;
 
 if (!class_exists('FormSetup')) {
-	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formsetup.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsetup.class.php';
 }
 
 $formSetup = new FormSetup($db);
 
-require_once __DIR__ . '/../class/webPortalTheme.class.php';
+require_once __DIR__.'/../class/webPortalTheme.class.php';
 $webPortalTheme = new WebPortalTheme();
 
 // Setup conf for secondary color
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT . '/core/actions_setmoduleoptions.inc.php';
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 // Force always edit mode
 if (empty($action) || $action == 'update') {
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
 llxHeader('', $langs->trans($title), $help_url);
 
 // Subheader
-$linkback = '<a href="' . ($backtopage ? $backtopage : DOL_URL_ROOT . '/admin/modules.php?restore_lastsearch_values=1') . '">' . $langs->trans("BackToModuleList") . '</a>';
+$linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
 
 print load_fiche_titre($langs->trans($title), $linkback, 'title_setup');
 
@@ -132,10 +132,10 @@  discard block
 block discarded – undo
 } elseif (!empty($formSetup->items)) {
 	print $formSetup->generateOutput();
 	print '<div class="tabsAction">';
-	print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=edit&token=' . newToken() . '">' . $langs->trans("Modify") . '</a>';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
 	print '</div>';
 } else {
-	print '<br>' . $langs->trans("NothingToSetup");
+	print '<br>'.$langs->trans("NothingToSetup");
 }
 
 

Please login to merge, or discard this patch.

htdocs/webportal/admin/setup.php 1 patch

Spacing +63 added lines, -63 removed lines patch added patch discarded remove patch

@@ -24,8 +24,8 @@  discard block
 block discarded – undo
 
 // Load Dolibarr environment
 require_once "../../main.inc.php";
-require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
-require_once DOL_DOCUMENT_ROOT . "/webportal/lib/webportal.lib.php";
+require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
+require_once DOL_DOCUMENT_ROOT."/webportal/lib/webportal.lib.php";
 
 // Translations
 $langs->loadLangs(array("admin", "webportal"));
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
 // Parameters
 $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
-$modulepart = GETPOST('modulepart', 'aZ09');    // Used by actions_setmoduleoptions.inc.php
+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
 
 if (empty($action)) {
 	$action = 'edit';
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
 $useFormSetup = 1;
 
 if (!class_exists('FormSetup')) {
-	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formsetup.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsetup.class.php';
 }
 
 $formSetup = new FormSetup($db);
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
 $item = $formSetup->newItem('WEBPORTAL_ROOT_URL')->setAsString();
 $item->fieldAttr = array('placeholder' => 'https://');
 $item->helpText = $langs->transnoentities('WebPortalRootUrlHelp');
-require_once __DIR__ . '/../class/context.class.php';
+require_once __DIR__.'/../class/context.class.php';
 $context = Context::getInstance();
 $item->fieldOutputOverride = '<a target="_blank" href="'.Context::getRootConfigUrl().'" >'.img_picto('', 'globe', 'class="pictofixedwidth"').Context::getRootConfigUrl().'</a>';
 
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT . '/core/actions_setmoduleoptions.inc.php';
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask') {
 	$maskconst = GETPOST('maskconst', 'aZ09');
@@ -153,10 +153,10 @@  discard block
 block discarded – undo
 	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
-		$file = dol_buildpath($reldir . "core/modules/webportal/doc/pdf_" . $modele . "_" . strtolower($tmpobjectkey) . ".modules.php", 0);
+		$file = dol_buildpath($reldir."core/modules/webportal/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
 		if (file_exists($file)) {
 			$filefound = 1;
-			$classname = "pdf_" . $modele . "_" . strtolower($tmpobjectkey);
+			$classname = "pdf_".$modele."_".strtolower($tmpobjectkey);
 			break;
 		}
 	}
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
 		$module = new $classname($db);
 
 		if ($module->write_file($tmpobject, $langs) > 0) {
-			header("Location: " . DOL_URL_ROOT . "/document.php?modulepart=webportal-" . strtolower($tmpobjectkey) . "&file=SPECIMEN.pdf");
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=webportal-".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
 			return;
 		} else {
 			setEventMessages($module->error, null, 'errors');
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
 	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
 	$tmpobjectkey = GETPOST('object');
 	if (!empty($tmpobjectkey)) {
-		$constforval = 'WEBPORTAL_' . strtoupper($tmpobjectkey) . "_ADDON";
+		$constforval = 'WEBPORTAL_'.strtoupper($tmpobjectkey)."_ADDON";
 		dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
 	}
 } elseif ($action == 'set') {
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
 	if ($ret > 0) {
 		$tmpobjectkey = GETPOST('object');
 		if (!empty($tmpobjectkey)) {
-			$constforval = 'WEBPORTAL_' . strtoupper($tmpobjectkey) . '_ADDON_PDF';
+			$constforval = 'WEBPORTAL_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 			if (getDolGlobalString($constforval) == "$value") {
 				dolibarr_del_const($db, $constforval, $conf->entity);
 			}
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
 	// Set or unset default model
 	$tmpobjectkey = GETPOST('object');
 	if (!empty($tmpobjectkey)) {
-		$constforval = 'WEBPORTAL_' . strtoupper($tmpobjectkey) . '_ADDON_PDF';
+		$constforval = 'WEBPORTAL_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
 			// The constant that was read before the new set
 			// We therefore requires a variable to have a coherent view
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
 } elseif ($action == 'unsetdoc') {
 	$tmpobjectkey = GETPOST('object');
 	if (!empty($tmpobjectkey)) {
-		$constforval = 'WEBPORTAL_' . strtoupper($tmpobjectkey) . '_ADDON_PDF';
+		$constforval = 'WEBPORTAL_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		dolibarr_del_const($db, $constforval, $conf->entity);
 	}
 }
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
 llxHeader('', $langs->trans($title), $help_url);
 
 // Subheader
-$linkback = '<a href="' . ($backtopage ? $backtopage : DOL_URL_ROOT . '/admin/modules.php?restore_lastsearch_values=1') . '">' . $langs->trans("BackToModuleList") . '</a>';
+$linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
 
 print load_fiche_titre($langs->trans($title), $linkback, 'title_setup');
 
@@ -257,10 +257,10 @@  discard block
 block discarded – undo
 } elseif (!empty($formSetup->items)) {
 	print $formSetup->generateOutput();
 	print '<div class="tabsAction">';
-	print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=edit&token=' . newToken() . '">' . $langs->trans("Modify") . '</a>';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
 	print '</div>';
 } else {
-	print '<br>' . $langs->trans("NothingToSetup");
+	print '<br>'.$langs->trans("NothingToSetup");
 }
 
 
@@ -282,26 +282,26 @@  discard block
 block discarded – undo
 
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
-		print '<td>' . $langs->trans("Name") . '</td>';
-		print '<td>' . $langs->trans("Description") . '</td>';
-		print '<td class="nowrap">' . $langs->trans("Example") . '</td>';
-		print '<td class="center" width="60">' . $langs->trans("Status") . '</td>';
-		print '<td class="center" width="16">' . $langs->trans("ShortInfo") . '</td>';
-		print '</tr>' . "\n";
+		print '<td>'.$langs->trans("Name").'</td>';
+		print '<td>'.$langs->trans("Description").'</td>';
+		print '<td class="nowrap">'.$langs->trans("Example").'</td>';
+		print '<td class="center" width="60">'.$langs->trans("Status").'</td>';
+		print '<td class="center" width="16">'.$langs->trans("ShortInfo").'</td>';
+		print '</tr>'."\n";
 
 		clearstatcache();
 
 		foreach ($dirmodels as $reldir) {
-			$dir = dol_buildpath($reldir . "core/modules/" . $moduledir);
+			$dir = dol_buildpath($reldir."core/modules/".$moduledir);
 
 			if (is_dir($dir)) {
 				$handle = opendir($dir);
 				if (is_resource($handle)) {
 					while (($file = readdir($handle)) !== false) {
-						if (strpos($file, 'mod_' . strtolower($myTmpObjectKey) . '_') === 0 && substr($file, dol_strlen($file) - 3, 3) == 'php') {
+						if (strpos($file, 'mod_'.strtolower($myTmpObjectKey).'_') === 0 && substr($file, dol_strlen($file) - 3, 3) == 'php') {
 							$file = substr($file, 0, dol_strlen($file) - 4);
 
-							require_once $dir . '/' . $file . '.php';
+							require_once $dir.'/'.$file.'.php';
 
 							$module = new $file($db);
 
@@ -314,9 +314,9 @@  discard block
 block discarded – undo
 							}
 
 							if ($module->isEnabled()) {
-								dol_include_once('/' . $moduledir . '/class/' . strtolower($myTmpObjectKey) . '.class.php');
+								dol_include_once('/'.$moduledir.'/class/'.strtolower($myTmpObjectKey).'.class.php');
 
-								print '<tr class="oddeven"><td>' . $module->name . "</td><td>\n";
+								print '<tr class="oddeven"><td>'.$module->name."</td><td>\n";
 								print $module->info();
 								print '</td>';
 
@@ -325,20 +325,20 @@  discard block
 block discarded – undo
 								$tmp = $module->getExample();
 								if (preg_match('/^Error/', $tmp)) {
 									$langs->load("errors");
-									print '<div class="error">' . $langs->trans($tmp) . '</div>';
+									print '<div class="error">'.$langs->trans($tmp).'</div>';
 								} elseif ($tmp == 'NotConfigured') {
 									print $langs->trans($tmp);
 								} else {
 									print $tmp;
 								}
-								print '</td>' . "\n";
+								print '</td>'."\n";
 
 								print '<td class="center">';
-								$constforvar = 'WEBPORTAL_' . strtoupper($myTmpObjectKey) . '_ADDON';
+								$constforvar = 'WEBPORTAL_'.strtoupper($myTmpObjectKey).'_ADDON';
 								if (getDolGlobalString($constforvar) == $file) {
 									print img_picto($langs->trans("Activated"), 'switch_on');
 								} else {
-									print '<a href="' . $_SERVER["PHP_SELF"] . '?action=setmod&token=' . newToken() . '&object=' . strtolower($myTmpObjectKey) . '&value=' . urlencode($file) . '">';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&object='.strtolower($myTmpObjectKey).'&value='.urlencode($file).'">';
 									print img_picto($langs->trans("Disabled"), 'switch_off');
 									print '</a>';
 								}
@@ -349,18 +349,18 @@  discard block
 block discarded – undo
 
 								// Info
 								$htmltooltip = '';
-								$htmltooltip .= '' . $langs->trans("Version") . ': <b>' . $module->getVersion() . '</b><br>';
+								$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
 
 								$nextval = $module->getNextValue($mytmpinstance);
 								if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
-									$htmltooltip .= '' . $langs->trans("NextValue") . ': ';
+									$htmltooltip .= ''.$langs->trans("NextValue").': ';
 									if ($nextval) {
 										if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured') {
 											$nextval = $langs->trans($nextval);
 										}
-										$htmltooltip .= $nextval . '<br>';
+										$htmltooltip .= $nextval.'<br>';
 									} else {
-										$htmltooltip .= $langs->trans($module->error) . '<br>';
+										$htmltooltip .= $langs->trans($module->error).'<br>';
 									}
 								}
 
@@ -391,9 +391,9 @@  discard block
 block discarded – undo
 		// Load array def with activated templates
 		$def = array();
 		$sql = "SELECT nom";
-		$sql .= " FROM " . $db->prefix() . "document_model";
-		$sql .= " WHERE type = '" . $db->escape($type) . "'";
-		$sql .= " AND entity = " . $conf->entity;
+		$sql .= " FROM ".$db->prefix()."document_model";
+		$sql .= " WHERE type = '".$db->escape($type)."'";
+		$sql .= " AND entity = ".$conf->entity;
 		$resql = $db->query($sql);
 		if ($resql) {
 			$i = 0;
@@ -409,19 +409,19 @@  discard block
 block discarded – undo
 
 		print "<table class=\"noborder\" width=\"100%\">\n";
 		print "<tr class=\"liste_titre\">\n";
-		print '<td>' . $langs->trans("Name") . '</td>';
-		print '<td>' . $langs->trans("Description") . '</td>';
-		print '<td class="center" width="60">' . $langs->trans("Status") . "</td>\n";
-		print '<td class="center" width="60">' . $langs->trans("Default") . "</td>\n";
-		print '<td class="center" width="38">' . $langs->trans("ShortInfo") . '</td>';
-		print '<td class="center" width="38">' . $langs->trans("Preview") . '</td>';
+		print '<td>'.$langs->trans("Name").'</td>';
+		print '<td>'.$langs->trans("Description").'</td>';
+		print '<td class="center" width="60">'.$langs->trans("Status")."</td>\n";
+		print '<td class="center" width="60">'.$langs->trans("Default")."</td>\n";
+		print '<td class="center" width="38">'.$langs->trans("ShortInfo").'</td>';
+		print '<td class="center" width="38">'.$langs->trans("Preview").'</td>';
 		print "</tr>\n";
 
 		clearstatcache();
 
 		foreach ($dirmodels as $reldir) {
 			foreach (array('', '/doc') as $valdir) {
-				$realpath = $reldir . "core/modules/" . $moduledir . $valdir;
+				$realpath = $reldir."core/modules/".$moduledir.$valdir;
 				$dir = dol_buildpath($realpath);
 
 				if (is_dir($dir)) {
@@ -435,11 +435,11 @@  discard block
 block discarded – undo
 
 						foreach ($filelist as $file) {
 							if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file)) {
-								if (file_exists($dir . '/' . $file)) {
+								if (file_exists($dir.'/'.$file)) {
 									$name = substr($file, 4, dol_strlen($file) - 16);
 									$classname = substr($file, 0, dol_strlen($file) - 12);
 
-									require_once $dir . '/' . $file;
+									require_once $dir.'/'.$file;
 									$module = new $classname($db);
 
 									$modulequalified = 1;
@@ -463,40 +463,40 @@  discard block
 block discarded – undo
 
 										// Active
 										if (in_array($name, $def)) {
-											print '<td class="center">' . "\n";
-											print '<a href="' . $_SERVER["PHP_SELF"] . '?action=del&token=' . newToken() . '&value=' . urlencode($name) . '">';
+											print '<td class="center">'."\n";
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&token='.newToken().'&value='.urlencode($name).'">';
 											print img_picto($langs->trans("Enabled"), 'switch_on');
 											print '</a>';
 											print '</td>';
 										} else {
-											print '<td class="center">' . "\n";
-											print '<a href="' . $_SERVER["PHP_SELF"] . '?action=set&token=' . newToken() . '&value=' . urlencode($name) . '&scan_dir=' . urlencode($module->scandir) . '&label=' . urlencode($module->name) . '">' . img_picto($langs->trans("Disabled"), 'switch_off') . '</a>';
+											print '<td class="center">'."\n";
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&token='.newToken().'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 											print "</td>";
 										}
 
 										// Default
 										print '<td class="center">';
-										$constforvar = 'WEBPORTAL_' . strtoupper($myTmpObjectKey) . '_ADDON_PDF';
+										$constforvar = 'WEBPORTAL_'.strtoupper($myTmpObjectKey).'_ADDON_PDF';
 										if (getDolGlobalString($constforvar) == $name) {
 											//print img_picto($langs->trans("Default"), 'on');
 											// Even if choice is the default value, we allow to disable it. Replace this with previous line if you need to disable unset
-											print '<a href="' . $_SERVER["PHP_SELF"] . '?action=unsetdoc&token=' . newToken() . '&object=' . urlencode(strtolower($myTmpObjectKey)) . '&value=' . urlencode($name) . '&scan_dir=' . urlencode($module->scandir) . '&label=' . urlencode($module->name) . '&amp;type=' . urlencode($type) . '" alt="' . $langs->trans("Disable") . '">' . img_picto($langs->trans("Enabled"), 'on') . '</a>';
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&token='.newToken().'&object='.urlencode(strtolower($myTmpObjectKey)).'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'&amp;type='.urlencode($type).'" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 										} else {
-											print '<a href="' . $_SERVER["PHP_SELF"] . '?action=setdoc&token=' . newToken() . '&object=' . urlencode(strtolower($myTmpObjectKey)) . '&value=' . urlencode($name) . '&scan_dir=' . urlencode($module->scandir) . '&label=' . urlencode($module->name) . '" alt="' . $langs->trans("Default") . '">' . img_picto($langs->trans("Disabled"), 'off') . '</a>';
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&token='.newToken().'&object='.urlencode(strtolower($myTmpObjectKey)).'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 										}
 										print '</td>';
 
 										// Info
-										$htmltooltip = '' . $langs->trans("Name") . ': ' . $module->name;
-										$htmltooltip .= '<br>' . $langs->trans("Type") . ': ' . ($module->type ? $module->type : $langs->trans("Unknown"));
+										$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+										$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
 										if ($module->type == 'pdf') {
-											$htmltooltip .= '<br>' . $langs->trans("Width") . '/' . $langs->trans("Height") . ': ' . $module->page_largeur . '/' . $module->page_hauteur;
+											$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
 										}
-										$htmltooltip .= '<br>' . $langs->trans("Path") . ': ' . preg_replace('/^\//', '', $realpath) . '/' . $file;
+										$htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
 
-										$htmltooltip .= '<br><br><u>' . $langs->trans("FeaturesSupported") . ':</u>';
-										$htmltooltip .= '<br>' . $langs->trans("Logo") . ': ' . yn($module->option_logo, 1, 1);
-										$htmltooltip .= '<br>' . $langs->trans("MultiLanguage") . ': ' . yn($module->option_multilang, 1, 1);
+										$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+										$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
+										$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
 
 										print '<td class="center">';
 										print $form->textwithpicto('', $htmltooltip, 1, 0);
@@ -505,8 +505,8 @@  discard block
 block discarded – undo
 										// Preview
 										print '<td class="center">';
 										if ($module->type == 'pdf') {
-											$newname = preg_replace('/_' . preg_quote(strtolower($myTmpObjectKey), '/') . '/', '', $name);
-											print '<a href="' . $_SERVER["PHP_SELF"] . '?action=specimen&module=' . urlencode($newname) . '&object=' . urlencode($myTmpObjectKey) . '">' . img_object($langs->trans("Preview"), 'pdf') . '</a>';
+											$newname = preg_replace('/_'.preg_quote(strtolower($myTmpObjectKey), '/').'/', '', $name);
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.urlencode($newname).'&object='.urlencode($myTmpObjectKey).'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 										} else {
 											print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 										}

Please login to merge, or discard this patch.

htdocs/webportal/admin/configcss.php 1 patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -25,8 +25,8 @@  discard block
 block discarded – undo
 
 // Load Dolibarr environment
 require_once "../../main.inc.php";
-require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
-require_once DOL_DOCUMENT_ROOT . "/webportal/lib/webportal.lib.php";
+require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
+require_once DOL_DOCUMENT_ROOT."/webportal/lib/webportal.lib.php";
 
 // Translations
 $langs->loadLangs(array("admin", "hrm", "other"));
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
 );
 
 // Subheader
-$linkback = '<a href="' . ($backtopage ? $backtopage : DOL_URL_ROOT . '/admin/modules.php?restore_lastsearch_values=1') . '">' . $langs->trans("BackToModuleList") . '</a>';
+$linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
 
 print load_fiche_titre($langs->trans($title), $linkback, 'title_setup');
 
@@ -107,14 +107,14 @@  discard block
 block discarded – undo
 print dol_get_fiche_head($head, 'css', $langs->trans($title), -1, "webportal");
 
 // Setup page goes here
-echo '<span class="opacitymedium">' . $langs->trans("WebPortalCSS") . '</span><br><br>';
+echo '<span class="opacitymedium">'.$langs->trans("WebPortalCSS").'</span><br><br>';
 
 //WYSIWYG Editor
-require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
-print '<form enctype="multipart/form-data" method="POST" action="' . $_SERVER["PHP_SELF"] . '">';
+print '<form enctype="multipart/form-data" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 
-print '<input type="hidden" name="token" value="' . newToken() . '">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="updatecss">';
 
 clearstatcache();
@@ -130,14 +130,14 @@  discard block
 block discarded – undo
 
 $doleditor = new DolEditor('WEBPORTAL_CUSTOM_CSS', $customcssValue, '80%', 400, 'Basic', 'In', true, false, 'ace', 10, '90%');
 $doleditor->Create(0, '', true, 'css', 'css');
-print '</td></tr>' . "\n";
+print '</td></tr>'."\n";
 
-print '</table>' . "\n";
+print '</table>'."\n";
 print '</div>';
 
 print '<div class="center">';
-print '<input class="button button-save reposition buttonforacesave" type="submit" name="submit" value="' . $langs->trans("Save") . '">';
-print '<input class="button button-cancel reposition" type="submit" name="cancel" value="' . $langs->trans("Cancel") . '">';
+print '<input class="button button-save reposition buttonforacesave" type="submit" name="submit" value="'.$langs->trans("Save").'">';
+print '<input class="button button-cancel reposition" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
 print '</div>';
 
 print '</form>';

Please login to merge, or discard this patch.

htdocs/ai/admin/setup.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -34,7 +34,7 @@  discard block
 block discarded – undo
 // Parameters
 $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
-$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
 
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
 
 $arrayofia = array('chatgpt');
 
-foreach($arrayofia as $ia) {
+foreach ($arrayofia as $ia) {
 	// Setup conf AI_PUBLIC_INTERFACE_TOPIC
 	$item = $formSetup->newItem('AI_KEY_API_'.strtoupper($ia));
 	$item->defaultFieldValue = '';
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
 // Retrieve existing API Key
 //$apiKey = dolibarr_get_const($db, 'MAIN_AI_CHATGPT_API_KEY');
 
-$setupnotempty =+ count($formSetup->items);
+$setupnotempty = + count($formSetup->items);
 
 
 $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);

Please login to merge, or discard this patch.

		@@ -154,15 +154,15 @@ discard block
		block discarded – undo
154	154	return $hookmanager->resPrint;
155	155	} else {
156	156	$out = '<!-- Start generateOutput from FormSetup class -->';
157		- $out.= $this->htmlBeforeOutputForm;
	157	+ $out .= $this->htmlBeforeOutputForm;
158	158
159	159	if ($editMode) {
160		- $out.= '<form ' . self::generateAttributesStringFromArray($this->formAttributes) . ' >';
	160	+ $out .= '<form '.self::generateAttributesStringFromArray($this->formAttributes).' >';
161	161
162	162	// generate hidden values from $this->formHiddenInputs
163	163	if (!empty($this->formHiddenInputs) && is_array($this->formHiddenInputs)) {
164	164	foreach ($this->formHiddenInputs as $hiddenKey => $hiddenValue) {
165		- $out.= '<input type="hidden" name="'.dol_escape_htmltag($hiddenKey).'" value="' . dol_escape_htmltag($hiddenValue) . '">';
	165	+ $out .= '<input type="hidden" name="'.dol_escape_htmltag($hiddenKey).'" value="'.dol_escape_htmltag($hiddenValue).'">';
166	166	}
167	167	}
168	168	}
		@@ -180,8 +180,8 @@ discard block
		block discarded – undo
180	180	return $hookmanager->resPrint;
181	181	} elseif ($editMode) {
182	182	$out .= '<div class="form-setup-button-container center">'; // Todo : remove .center by adding style to form-setup-button-container css class in all themes
183		- $out.= $this->htmlOutputMoreButton;
184		- $out .= '<input class="button button-save" type="submit" value="' . $this->langs->trans("Save") . '">'; // Todo fix dolibarr style for <button and use <button instead of input
	183	+ $out .= $this->htmlOutputMoreButton;
	184	+ $out .= '<input class="button button-save" type="submit" value="'.$this->langs->trans("Save").'">'; // Todo fix dolibarr style for <button and use <button instead of input
185	185	/*$out .= '    ';
186	186	$out .= '<a class="button button-cancel" type="submit" href="' . $this->formAttributes['action'] . '">'.$this->langs->trans('Cancel').'</a>';
187	187	*/
		@@ -192,7 +192,7 @@ discard block
		block discarded – undo
192	192	$out .= '</form>';
193	193	}
194	194
195		- $out.= $this->htmlAfterOutputForm;
	195	+ $out .= $this->htmlAfterOutputForm;
196	196
197	197	return $out;
198	198	}
		@@ -225,8 +225,8 @@ discard block
		block discarded – undo
225	225	if (empty($hideTitle)) {
226	226	$out .= '<thead>';
227	227	$out .= '<tr class="liste_titre">';
228		- $out .= ' <td>' . $this->langs->trans("Parameter") . '</td>';
229		- $out .= ' <td>' . $this->langs->trans("Value") . '</td>';
	228	+ $out .= ' <td>'.$this->langs->trans("Parameter").'</td>';
	229	+ $out .= ' <td>'.$this->langs->trans("Value").'</td>';
230	230	$out .= '</tr>';
231	231	$out .= '</thead>';
232	232	}
		@@ -312,27 +312,27 @@ discard block
		block discarded – undo
312	312	public function generateLineOutput($item, $editMode = false)
313	313	{
314	314	$out = '';
315		- if ($item->enabled==1) {
	315	+ if ($item->enabled == 1) {
316	316	$trClass = 'oddeven';
317	317	if ($item->getType() == 'title') {
318	318	$trClass = 'liste_titre';
319	319	}
320	320
321	321	$this->setupNotEmpty++;
322		- $out.= '<tr class="'.$trClass.'">';
	322	+ $out .= '<tr class="'.$trClass.'">';
323	323
324		- $out.= '<td class="col-setup-title">';
325		- $out.= '<span id="helplink'.$item->confKey.'" class="spanforparamtooltip">';
326		- $out.= $this->form->textwithpicto($item->getNameText(), $item->getHelpText(), 1, 'info', '', 0, 3, 'tootips'.$item->confKey);
327		- $out.= '</span>';
328		- $out.= '</td>';
	324	+ $out .= '<td class="col-setup-title">';
	325	+ $out .= '<span id="helplink'.$item->confKey.'" class="spanforparamtooltip">';
	326	+ $out .= $this->form->textwithpicto($item->getNameText(), $item->getHelpText(), 1, 'info', '', 0, 3, 'tootips'.$item->confKey);
	327	+ $out .= '</span>';
	328	+ $out .= '</td>';
329	329
330		- $out.= '<td>';
	330	+ $out .= '<td>';
331	331
332	332	if ($editMode) {
333		- $out.= $item->generateInputField();
	333	+ $out .= $item->generateInputField();
334	334	} else {
335		- $out.= $item->generateOutputField();
	335	+ $out .= $item->generateOutputField();
336	336	}
337	337
338	338	if (!empty($item->errors)) {
		@@ -340,8 +340,8 @@ discard block
		block discarded – undo
340	340	setEventMessages(null, $item->errors, 'errors');
341	341	}
342	342
343		- $out.= '</td>';
344		- $out.= '</tr>';
	343	+ $out .= '</td>';
	344	+ $out .= '</tr>';
345	345	}
346	346
347	347	return $out;
		@@ -812,7 +812,7 @@ discard block
		block discarded – undo
812	812	if (!empty($this->helpText)) {
813	813	return $this->helpText;
814	814	}
815		- return (($this->langs->trans($this->confKey . 'Tooltip') != $this->confKey . 'Tooltip') ? $this->langs->trans($this->confKey . 'Tooltip') : '');
	815	+ return (($this->langs->trans($this->confKey.'Tooltip') != $this->confKey.'Tooltip') ? $this->langs->trans($this->confKey.'Tooltip') : '');
816	816	}
817	817
818	818	/**
		@@ -858,47 +858,47 @@ discard block
		block discarded – undo
858	858	$out = '';
859	859
860	860	if ($this->type == 'title') {
861		- $out.= $this->generateOutputField(); // title have no input
	861	+ $out .= $this->generateOutputField(); // title have no input
862	862	} elseif ($this->type == 'multiselect') {
863		- $out.= $this->generateInputFieldMultiSelect();
	863	+ $out .= $this->generateInputFieldMultiSelect();
864	864	} elseif ($this->type == 'select') {
865		- $out.= $this->generateInputFieldSelect();
	865	+ $out .= $this->generateInputFieldSelect();
866	866	} elseif ($this->type == 'selectUser') {
867		- $out.= $this->generateInputFieldSelectUser();
	867	+ $out .= $this->generateInputFieldSelectUser();
868	868	} elseif ($this->type == 'textarea') {
869		- $out.= $this->generateInputFieldTextarea();
870		- } elseif ($this->type== 'html') {
871		- $out.= $this->generateInputFieldHtml();
872		- } elseif ($this->type== 'color') {
873		- $out.= $this->generateInputFieldColor();
	869	+ $out .= $this->generateInputFieldTextarea();
	870	+ } elseif ($this->type == 'html') {
	871	+ $out .= $this->generateInputFieldHtml();
	872	+ } elseif ($this->type == 'color') {
	873	+ $out .= $this->generateInputFieldColor();
874	874	} elseif ($this->type == 'yesno') {
875	875	if (!empty($conf->use_javascript_ajax)) {
876		- $out.= ajax_constantonoff($this->confKey);
	876	+ $out .= ajax_constantonoff($this->confKey);
877	877	} else {
878		- $out.= $this->form->selectyesno($this->confKey, $this->fieldValue, 1);
	878	+ $out .= $this->form->selectyesno($this->confKey, $this->fieldValue, 1);
879	879	}
880	880	} elseif (preg_match('/emailtemplate:/', $this->type)) {
881		- $out.= $this->generateInputFieldEmailTemplate();
	881	+ $out .= $this->generateInputFieldEmailTemplate();
882	882	} elseif (preg_match('/category:/', $this->type)) {
883		- $out.=$this->generateInputFieldCategories();
	883	+ $out .= $this->generateInputFieldCategories();
884	884	} elseif (preg_match('/thirdparty_type/', $this->type)) {
885	885	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
886	886	$formcompany = new FormCompany($this->db);
887		- $out.= $formcompany->selectProspectCustomerType($this->fieldValue, $this->confKey);
	887	+ $out .= $formcompany->selectProspectCustomerType($this->fieldValue, $this->confKey);
888	888	} elseif ($this->type == 'securekey') {
889		- $out.= $this->generateInputFieldSecureKey();
	889	+ $out .= $this->generateInputFieldSecureKey();
890	890	} elseif ($this->type == 'product') {
891	891	if (isModEnabled("product") \|\| isModEnabled("service")) {
892	892	$selected = (empty($this->fieldValue) ? '' : $this->fieldValue);
893		- $out.= $this->form->select_produits($selected, $this->confKey, '', 0, 0, 1, 2, '', 0, array(), 0, '1', 0, $this->cssClass, 0, '', null, 1);
	893	+ $out .= $this->form->select_produits($selected, $this->confKey, '', 0, 0, 1, 2, '', 0, array(), 0, '1', 0, $this->cssClass, 0, '', null, 1);
894	894	}
895	895	} elseif ($this->type == 'selectBankAccount') {
896	896	if (isModEnabled("bank")) {
897	897	$selected = (empty($this->fieldValue) ? '' : $this->fieldValue);
898		- $out.= $this->form->select_comptes($selected, $this->confKey, 0, '', 0, '', 0, '', 1);
	898	+ $out .= $this->form->select_comptes($selected, $this->confKey, 0, '', 0, '', 0, '', 1);
899	899	}
900	900	} else {
901		- $out.= $this->generateInputFieldText();
	901	+ $out .= $this->generateInputFieldText();
902	902	}
903	903
904	904	return $out;
		@@ -924,9 +924,9 @@ discard block
		block discarded – undo
924	924	*/
925	925	public function generateInputFieldTextarea()
926	926	{
927		- $out = '<textarea class="flat" name="'.$this->confKey.'" id="'.$this->confKey.'" cols="50" rows="5" wrap="soft">' . "\n";
928		- $out.= dol_htmlentities($this->fieldValue);
929		- $out.= "</textarea>\n";
	927	+ $out = '<textarea class="flat" name="'.$this->confKey.'" id="'.$this->confKey.'" cols="50" rows="5" wrap="soft">'."\n";
	928	+ $out .= dol_htmlentities($this->fieldValue);
	929	+ $out .= "</textarea>\n";
930	930	return $out;
931	931	}
932	932
		@@ -938,7 +938,7 @@ discard block
		block discarded – undo
938	938	public function generateInputFieldHtml()
939	939	{
940	940	global $conf;
941		- require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
	941	+ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
942	942	$doleditor = new DolEditor($this->confKey, $this->fieldValue, '', 160, 'dolibarr_notes', '', false, false, isModEnabled('fckeditor'), ROWS_5, '90%');
943	943	return $doleditor->Create(1);
944	944	}
		@@ -976,7 +976,7 @@ discard block
		block discarded – undo
976	976
977	977	$out = '';
978	978	if (preg_match('/emailtemplate:/', $this->type)) {
979		- include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
	979	+ include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
980	980	$formmail = new FormMail($this->db);
981	981
982	982	$tmp = explode(':', $this->type);
		@@ -986,10 +986,10 @@ discard block
		block discarded – undo
986	986	foreach ($formmail->lines_model as $modelMail) {
987	987	$moreonlabel = '';
988	988	if (!empty($arrayOfMessageName[$modelMail->label])) {
989		- $moreonlabel = ' <span class="opacitymedium">(' . $this->langs->trans("SeveralLangugeVariatFound") . ')</span>';
	989	+ $moreonlabel = ' <span class="opacitymedium">('.$this->langs->trans("SeveralLangugeVariatFound").')</span>';
990	990	}
991	991	// The 'label' is the key that is unique if we exclude the language
992		- $arrayOfMessageName[$modelMail->id] = $this->langs->trans(preg_replace('/\(\|\)/', '', $modelMail->label)) . $moreonlabel;
	992	+ $arrayOfMessageName[$modelMail->id] = $this->langs->trans(preg_replace('/\(\|\)/', '', $modelMail->label)).$moreonlabel;
993	993	}
994	994	}
995	995	$out .= $this->form->selectarray($this->confKey, $arrayOfMessageName, $this->fieldValue, 'None', 0, 0, '', 0, 0, 0, '', '', 1);
		@@ -1009,7 +1009,7 @@ discard block
		block discarded – undo
1009	1009	global $conf;
1010	1010	$out = '<input required="required" type="text" class="flat" id="'.$this->confKey.'" name="'.$this->confKey.'" value="'.(GETPOST($this->confKey, 'alpha') ? GETPOST($this->confKey, 'alpha') : $this->fieldValue).'" size="40">';
1011	1011	if (!empty($conf->use_javascript_ajax)) {
1012		- $out.= ' '.img_picto($this->langs->trans('Generate'), 'refresh', 'id="generate_token'.$this->confKey.'" class="linkobject"');
	1012	+ $out .= ' '.img_picto($this->langs->trans('Generate'), 'refresh', 'id="generate_token'.$this->confKey.'" class="linkobject"');
1013	1013	}
1014	1014
1015	1015	// Add button to autosuggest a key
		@@ -1124,30 +1124,30 @@ discard block
		block discarded – undo
1124	1124	if ($this->type == 'title') {
1125	1125	// nothing to do
1126	1126	} elseif ($this->type == 'textarea') {
1127		- $out.= dol_nl2br($this->fieldValue);
	1127	+ $out .= dol_nl2br($this->fieldValue);
1128	1128	} elseif ($this->type == 'multiselect') {
1129		- $out.= $this->generateOutputFieldMultiSelect();
	1129	+ $out .= $this->generateOutputFieldMultiSelect();
1130	1130	} elseif ($this->type == 'select') {
1131		- $out.= $this->generateOutputFieldSelect();
	1131	+ $out .= $this->generateOutputFieldSelect();
1132	1132	} elseif ($this->type == 'selectUser') {
1133		- $out.= $this->generateOutputFieldSelectUser();
	1133	+ $out .= $this->generateOutputFieldSelectUser();
1134	1134	} elseif ($this->type == 'html') {
1135		- $out.= $this->fieldValue;
	1135	+ $out .= $this->fieldValue;
1136	1136	} elseif ($this->type == 'color') {
1137		- $out.= $this->generateOutputFieldColor();
	1137	+ $out .= $this->generateOutputFieldColor();
1138	1138	} elseif ($this->type == 'yesno') {
1139	1139	if (!empty($conf->use_javascript_ajax)) {
1140		- $out.= ajax_constantonoff($this->confKey);
	1140	+ $out .= ajax_constantonoff($this->confKey);
1141	1141	} else {
1142	1142	if ($this->fieldValue == 1) {
1143		- $out.= $langs->trans('yes');
	1143	+ $out .= $langs->trans('yes');
1144	1144	} else {
1145		- $out.= $langs->trans('no');
	1145	+ $out .= $langs->trans('no');
1146	1146	}
1147	1147	}
1148	1148	} elseif (preg_match('/emailtemplate:/', $this->type)) {
1149	1149	if ($this->fieldValue > 0) {
1150		- include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
	1150	+ include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
1151	1151	$formmail = new FormMail($this->db);
1152	1152
1153	1153	$tmp = explode(':', $this->type);
		@@ -1156,7 +1156,7 @@ discard block
		block discarded – undo
1156	1156	if (is_numeric($template) && $template < 0) {
1157	1157	$this->setErrors($formmail->errors);
1158	1158	}
1159		- $out.= $this->langs->trans($template->label);
	1159	+ $out .= $this->langs->trans($template->label);
1160	1160	}
1161	1161	} elseif (preg_match('/category:/', $this->type)) {
1162	1162	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
		@@ -1168,18 +1168,18 @@ discard block
		block discarded – undo
1168	1168	$ways = $c->print_all_ways(' >> ', 'none', 0, 1); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formatted text
1169	1169	$toprint = array();
1170	1170	foreach ($ways as $way) {
1171		- $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"' . ($c->color ? ' style="background: #' . $c->color . ';"' : ' style="background: #bbb"') . '>' . $way . '</li>';
	1171	+ $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"'.($c->color ? ' style="background: #'.$c->color.';"' : ' style="background: #bbb"').'>'.$way.'</li>';
1172	1172	}
1173		- $out.='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
	1173	+ $out .= '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
1174	1174	} elseif (preg_match('/thirdparty_type/', $this->type)) {
1175		- if ($this->fieldValue==2) {
1176		- $out.= $this->langs->trans("Prospect");
1177		- } elseif ($this->fieldValue==3) {
1178		- $out.= $this->langs->trans("ProspectCustomer");
1179		- } elseif ($this->fieldValue==1) {
1180		- $out.= $this->langs->trans("Customer");
1181		- } elseif ($this->fieldValue==0) {
1182		- $out.= $this->langs->trans("NorProspectNorCustomer");
	1175	+ if ($this->fieldValue == 2) {
	1176	+ $out .= $this->langs->trans("Prospect");
	1177	+ } elseif ($this->fieldValue == 3) {
	1178	+ $out .= $this->langs->trans("ProspectCustomer");
	1179	+ } elseif ($this->fieldValue == 1) {
	1180	+ $out .= $this->langs->trans("Customer");
	1181	+ } elseif ($this->fieldValue == 0) {
	1182	+ $out .= $this->langs->trans("NorProspectNorCustomer");
1183	1183	}
1184	1184	} elseif ($this->type == 'product') {
1185	1185	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
		@@ -1187,7 +1187,7 @@ discard block
		block discarded – undo
1187	1187	$product = new Product($this->db);
1188	1188	$resprod = $product->fetch($this->fieldValue);
1189	1189	if ($resprod > 0) {
1190		- $out.= $product->ref;
	1190	+ $out .= $product->ref;
1191	1191	} elseif ($resprod < 0) {
1192	1192	$this->setErrors($product->errors);
1193	1193	}
		@@ -1197,12 +1197,12 @@ discard block
		block discarded – undo
1197	1197	$bankaccount = new Account($this->db);
1198	1198	$resbank = $bankaccount->fetch($this->fieldValue);
1199	1199	if ($resbank > 0) {
1200		- $out.= $bankaccount->label;
	1200	+ $out .= $bankaccount->label;
1201	1201	} elseif ($resbank < 0) {
1202	1202	$this->setErrors($bankaccount->errors);
1203	1203	}
1204	1204	} else {
1205		- $out.= $this->fieldValue;
	1205	+ $out .= $this->fieldValue;
1206	1206	}
1207	1207
1208	1208	return $out;
		@@ -1225,7 +1225,7 @@ discard block
		block discarded – undo
1225	1225	if (!empty($TSelected)) {
1226	1226	foreach ($TSelected as $selected) {
1227	1227	if (!empty($this->fieldOptions[$selected])) {
1228		- $outPut.= dolGetBadge('', $this->fieldOptions[$selected], 'info').' ';
	1228	+ $outPut .= dolGetBadge('', $this->fieldOptions[$selected], 'info').' ';
1229	1229	}
1230	1230	}
1231	1231	}
		@@ -1240,7 +1240,7 @@ discard block
		block discarded – undo
1240	1240	public function generateOutputFieldColor()
1241	1241	{
1242	1242	global $langs;
1243		- $this->fieldAttr['disabled']=null;
	1243	+ $this->fieldAttr['disabled'] = null;
1244	1244	$color = colorArrayToHex(colorStringToArray($this->fieldValue, array()), '');
1245	1245	if ($color) {
1246	1246	return '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
		@@ -1254,7 +1254,7 @@ discard block
		block discarded – undo
1254	1254	*/
1255	1255	public function generateInputFieldColor()
1256	1256	{
1257		- $this->fieldAttr['type']= 'color';
	1257	+ $this->fieldAttr['type'] = 'color';
1258	1258	$default = $this->defaultFieldValue;
1259	1259	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
1260	1260	$formother = new FormOther($this->db);
		@@ -1286,7 +1286,7 @@ discard block
		block discarded – undo
1286	1286	$outPut = '';
1287	1287	$user = new User($this->db);
1288	1288	$user->fetch($this->fieldValue);
1289		- $outPut = $user->firstname . " " . $user->lastname;
	1289	+ $outPut = $user->firstname." ".$user->lastname;
1290	1290	return $outPut;
1291	1291	}
1292	1292

		@@ -24,8 +24,8 @@ discard block
		block discarded – undo
24	24
25	25	// Load Dolibarr environment
26	26	require_once "../../main.inc.php";
27		-require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
28		-require_once DOL_DOCUMENT_ROOT . "/webportal/lib/webportal.lib.php";
	27	+require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
	28	+require_once DOL_DOCUMENT_ROOT."/webportal/lib/webportal.lib.php";
29	29
30	30	// Translations
31	31	$langs->loadLangs(array("admin", "webportal"));
		@@ -36,7 +36,7 @@ discard block
		block discarded – undo
36	36	// Parameters
37	37	$action = GETPOST('action', 'aZ09');
38	38	$backtopage = GETPOST('backtopage', 'alpha');
39		-$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
	39	+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
40	40
41	41	$value = GETPOST('value', 'alpha');
42	42	$label = GETPOST('label', 'alpha');
		@@ -54,12 +54,12 @@ discard block
		block discarded – undo
54	54	$useFormSetup = 1;
55	55
56	56	if (!class_exists('FormSetup')) {
57		- require_once DOL_DOCUMENT_ROOT . '/core/class/html.formsetup.class.php';
	57	+ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsetup.class.php';
58	58	}
59	59
60	60	$formSetup = new FormSetup($db);
61	61
62		-require_once __DIR__ . '/../class/webPortalTheme.class.php';
	62	+require_once __DIR__.'/../class/webPortalTheme.class.php';
63	63	$webPortalTheme = new WebPortalTheme();
64	64
65	65	// Setup conf for secondary color
		@@ -95,7 +95,7 @@ discard block
		block discarded – undo
95	95	* Actions
96	96	*/
97	97
98		-include DOL_DOCUMENT_ROOT . '/core/actions_setmoduleoptions.inc.php';
	98	+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
99	99
100	100	// Force always edit mode
101	101	if (empty($action) \|\| $action == 'update') {
		@@ -115,7 +115,7 @@ discard block
		block discarded – undo
115	115	llxHeader('', $langs->trans($title), $help_url);
116	116
117	117	// Subheader
118		-$linkback = '<a href="' . ($backtopage ? $backtopage : DOL_URL_ROOT . '/admin/modules.php?restore_lastsearch_values=1') . '">' . $langs->trans("BackToModuleList") . '</a>';
	118	+$linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
119	119
120	120	print load_fiche_titre($langs->trans($title), $linkback, 'title_setup');
121	121
		@@ -132,10 +132,10 @@ discard block
		block discarded – undo
132	132	} elseif (!empty($formSetup->items)) {
133	133	print $formSetup->generateOutput();
134	134	print '<div class="tabsAction">';
135		- print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=edit&token=' . newToken() . '">' . $langs->trans("Modify") . '</a>';
	135	+ print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
136	136	print '</div>';
137	137	} else {
138		- print '<br>' . $langs->trans("NothingToSetup");
	138	+ print '<br>'.$langs->trans("NothingToSetup");
139	139	}
140	140
141	141

		@@ -25,8 +25,8 @@ discard block
		block discarded – undo
25	25
26	26	// Load Dolibarr environment
27	27	require_once "../../main.inc.php";
28		-require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
29		-require_once DOL_DOCUMENT_ROOT . "/webportal/lib/webportal.lib.php";
	28	+require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
	29	+require_once DOL_DOCUMENT_ROOT."/webportal/lib/webportal.lib.php";
30	30
31	31	// Translations
32	32	$langs->loadLangs(array("admin", "hrm", "other"));
		@@ -98,7 +98,7 @@ discard block
		block discarded – undo
98	98	);
99	99
100	100	// Subheader
101		-$linkback = '<a href="' . ($backtopage ? $backtopage : DOL_URL_ROOT . '/admin/modules.php?restore_lastsearch_values=1') . '">' . $langs->trans("BackToModuleList") . '</a>';
	101	+$linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
102	102
103	103	print load_fiche_titre($langs->trans($title), $linkback, 'title_setup');
104	104
		@@ -107,14 +107,14 @@ discard block
		block discarded – undo
107	107	print dol_get_fiche_head($head, 'css', $langs->trans($title), -1, "webportal");
108	108
109	109	// Setup page goes here
110		-echo '<span class="opacitymedium">' . $langs->trans("WebPortalCSS") . '</span><br><br>';
	110	+echo '<span class="opacitymedium">'.$langs->trans("WebPortalCSS").'</span><br><br>';
111	111
112	112	//WYSIWYG Editor
113		-require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
	113	+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
114	114
115		-print '<form enctype="multipart/form-data" method="POST" action="' . $_SERVER["PHP_SELF"] . '">';
	115	+print '<form enctype="multipart/form-data" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
116	116
117		-print '<input type="hidden" name="token" value="' . newToken() . '">';
	117	+print '<input type="hidden" name="token" value="'.newToken().'">';
118	118	print '<input type="hidden" name="action" value="updatecss">';
119	119
120	120	clearstatcache();
		@@ -130,14 +130,14 @@ discard block
		block discarded – undo
130	130
131	131	$doleditor = new DolEditor('WEBPORTAL_CUSTOM_CSS', $customcssValue, '80%', 400, 'Basic', 'In', true, false, 'ace', 10, '90%');
132	132	$doleditor->Create(0, '', true, 'css', 'css');
133		-print '</td></tr>' . "\n";
	133	+print '</td></tr>'."\n";
134	134
135		-print '</table>' . "\n";
	135	+print '</table>'."\n";
136	136	print '</div>';
137	137
138	138	print '<div class="center">';
139		-print '<input class="button button-save reposition buttonforacesave" type="submit" name="submit" value="' . $langs->trans("Save") . '">';
140		-print '<input class="button button-cancel reposition" type="submit" name="cancel" value="' . $langs->trans("Cancel") . '">';
	139	+print '<input class="button button-save reposition buttonforacesave" type="submit" name="submit" value="'.$langs->trans("Save").'">';
	140	+print '<input class="button button-cancel reposition" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
141	141	print '</div>';
142	142
143	143	print '</form>';

		@@ -34,7 +34,7 @@ discard block
		block discarded – undo
34	34	// Parameters
35	35	$action = GETPOST('action', 'aZ09');
36	36	$backtopage = GETPOST('backtopage', 'alpha');
37		-$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
	37	+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
38	38
39	39	$value = GETPOST('value', 'alpha');
40	40	$label = GETPOST('label', 'alpha');
		@@ -61,7 +61,7 @@ discard block
		block discarded – undo
61	61
62	62	$arrayofia = array('chatgpt');
63	63
64		-foreach($arrayofia as $ia) {
	64	+foreach ($arrayofia as $ia) {
65	65	// Setup conf AI_PUBLIC_INTERFACE_TOPIC
66	66	$item = $formSetup->newItem('AI_KEY_API_'.strtoupper($ia));
67	67	$item->defaultFieldValue = '';
		@@ -70,7 +70,7 @@ discard block
		block discarded – undo
70	70	// Retrieve existing API Key
71	71	//$apiKey = dolibarr_get_const($db, 'MAIN_AI_CHATGPT_API_KEY');
72	72
73		-$setupnotempty =+ count($formSetup->items);
	73	+$setupnotempty = + count($formSetup->items);
74	74
75	75
76	76	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);

Dolibarr / dolibarr

Branch — develop (f9de28)

Status

Category

Spacing +75 added lines, -75 removed lines patch added patch discarded remove patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Spacing +63 added lines, -63 removed lines patch added patch discarded remove patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch