Dolibarr / dolibarr

htdocs/webportal/controllers/document.controller.class.php

Indentation +4 added lines, -4 removed lines

@@ -17,10 +17,10 @@
  */
 
  /**
- * \file        htdocs/webportal/controllers/document.controller.class.php
- * \ingroup     webportal
- * \brief       This file is a controller for documents
- */
+  * \file        htdocs/webportal/controllers/document.controller.class.php
+  * \ingroup     webportal
+  * \brief       This file is a controller for documents
+  */
 
 require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
 

Spacing +18 added lines, -18 removed lines

@@ -22,7 +22,7 @@ 
  * \brief       This file is a controller for documents
  */
 
-require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 
 /**
@@ -153,7 +153,7 @@ 
 		}
 
 		// Security: Delete string ../ or ..\ into $original_file
-		$original_file = preg_replace('/\.\.+/', '..', $original_file);    // Replace '... or more' with '..'
+		$original_file = preg_replace('/\.\.+/', '..', $original_file); // Replace '... or more' with '..'
 		$original_file = str_replace('../', '/', $original_file);
 		$original_file = str_replace('..\\', '/', $original_file);
 
@@ -170,13 +170,13 @@ 
 		// check config access
 		// and file mime type (only PDF)
 		// and check login access
-		if (getDolGlobalInt('WEBPORTAL_' . $moduleNameUpperEn . '_LIST_ACCESS')
+		if (getDolGlobalInt('WEBPORTAL_'.$moduleNameUpperEn.'_LIST_ACCESS')
 			&& in_array($type, array('application/pdf'))
 			&& ($context->logged_thirdparty && $context->logged_thirdparty->id > 0)
 			&& $context->logged_thirdparty->id == $socId
 		) {
 			if (isModEnabled($moduleName) && isset($conf->{$moduleName}->multidir_output[$entity])) {
-				$original_file = $conf->{$moduleName}->multidir_output[$entity] . '/' . $original_file;
+				$original_file = $conf->{$moduleName}->multidir_output[$entity].'/'.$original_file;
 				$accessallowed = 1;
 			}
 		}
@@ -191,13 +191,13 @@ 
 		// Security:
 		// We refuse directory transversal change and pipes in file names
 		if (preg_match('/\.\./', $fullpath_original_file) || preg_match('/[<>|]/', $fullpath_original_file)) {
-			dol_syslog("Refused to deliver file " . $fullpath_original_file);
-			print "ErrorFileNameInvalid: " . dol_escape_htmltag($original_file);
+			dol_syslog("Refused to deliver file ".$fullpath_original_file);
+			print "ErrorFileNameInvalid: ".dol_escape_htmltag($original_file);
 			exit;
 		}
 
 		// Find the subdirectory name as the reference
-		$refname = basename(dirname($original_file) . "/");
+		$refname = basename(dirname($original_file)."/");
 
 		$filename = basename($fullpath_original_file);
 		$filename = preg_replace('/\.noexe$/i', '', $filename);
@@ -208,8 +208,8 @@ 
 
 		// This test if file exists should be useless. We keep it to find bug more easily
 		if (!file_exists($fullpath_original_file_osencoded)) {
-			dol_syslog("ErrorFileDoesNotExists: " . $fullpath_original_file);
-			print "ErrorFileDoesNotExists: " . $original_file;
+			dol_syslog("ErrorFileDoesNotExists: ".$fullpath_original_file);
+			print "ErrorFileDoesNotExists: ".$original_file;
 			exit;
 		}
 
@@ -217,8 +217,8 @@ 
 		$fileSizeMaxDefault = 20 * 1024; // 20 Mo by default
 		$fileSizeMax = getDolGlobalInt('MAIN_SECURITY_MAXFILESIZE_DOWNLOADED', $fileSizeMaxDefault);
 		if ($fileSize > $fileSizeMax) {
-			dol_syslog('ErrorFileSizeTooLarge: ' . $fileSize);
-			print 'ErrorFileSizeTooLarge: ' . $fileSize . ' (max ' . $fileSizeMax . ')';
+			dol_syslog('ErrorFileSizeTooLarge: '.$fileSize);
+			print 'ErrorFileSizeTooLarge: '.$fileSize.' (max '.$fileSizeMax.')';
 			exit;
 		}
 
@@ -230,9 +230,9 @@ 
 		$object = new stdClass();
 		$reshook = $hookmanager->executeHooks('downloadDocument', $parameters, $object, $action); // Note that $action and $object may have been
 		if ($reshook < 0) {
-			$errors = $hookmanager->error . (is_array($hookmanager->errors) ? (!empty($hookmanager->error) ? ', ' : '') . implode(', ', $hookmanager->errors) : '');
-			dol_syslog("document.php - Errors when executing the hook 'downloadDocument' : " . $errors);
-			print "ErrorDownloadDocumentHooks: " . $errors;
+			$errors = $hookmanager->error.(is_array($hookmanager->errors) ? (!empty($hookmanager->error) ? ', ' : '').implode(', ', $hookmanager->errors) : '');
+			dol_syslog("document.php - Errors when executing the hook 'downloadDocument' : ".$errors);
+			print "ErrorDownloadDocumentHooks: ".$errors;
 			exit;
 		}
 
@@ -310,19 +310,19 @@ 
 		top_httphead($type);
 		header('Content-Description: File Transfer');
 		if ($encoding) {
-			header('Content-Encoding: ' . $encoding);
+			header('Content-Encoding: '.$encoding);
 		}
 		// Add MIME Content-Disposition from RFC 2183 (inline=automatically displayed, attachment=need user action to open)
 		if ($attachment) {
-			header('Content-Disposition: attachment; filename="' . $filename . '"');
+			header('Content-Disposition: attachment; filename="'.$filename.'"');
 		} else {
-			header('Content-Disposition: inline; filename="' . $filename . '"');
+			header('Content-Disposition: inline; filename="'.$filename.'"');
 		}
 		header('Cache-Control: Public, must-revalidate');
 		header('Pragma: public');
 
 		// Send file now
-		header('Content-Length: ' . dol_filesize($fullpath_original_file));
+		header('Content-Length: '.dol_filesize($fullpath_original_file));
 		readfileLowMemory($fullpath_original_file_osencoded);
 	}
 }

htdocs/ai/class/ai.class.php

Indentation +4 added lines, -4 removed lines

@@ -18,10 +18,10 @@
  */
 
  /**
- * \file    htdocs/ai/class/ai.class.php
- * \ingroup ai
- * \brief   Class files with common methods for Ai
- */
+  * \file    htdocs/ai/class/ai.class.php
+  * \ingroup ai
+  * \brief   Class files with common methods for Ai
+  */
 
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';

htdocs/core/modules/DolibarrModules.class.php

Spacing +24 added lines, -24 removed lines

@@ -627,7 +627,7 @@ 
 				$moduleNameInConf = 'supplier_proposal';
 			}
 
-			unset($conf->modules[$moduleNameInConf]);	// Add this module in list of enabled modules so isModEnabled() will work (conf->module->enabled must no more be used)
+			unset($conf->modules[$moduleNameInConf]); // Add this module in list of enabled modules so isModEnabled() will work (conf->module->enabled must no more be used)
 
 			return 1;
 		} else {
@@ -723,7 +723,7 @@ 
 		$pathoffile = $this->getDescLongReadmeFound();
 
 		if ($pathoffile) {     // Mostly for external modules
-			$content = file_get_contents($pathoffile, false, null, 0, 1024 * 1024);	// Max size loaded 1Mb
+			$content = file_get_contents($pathoffile, false, null, 0, 1024 * 1024); // Max size loaded 1Mb
 
 			if ((float) DOL_VERSION >= 6.0) {
 				@include_once DOL_DOCUMENT_ROOT.'/core/lib/parsemd.lib.php';
@@ -1488,7 +1488,7 @@ 
 
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes_def";
 				$sql .= " WHERE file = '".$this->db->escape($file)."'";
-				$sql .= " AND entity = ".$conf->entity;		// Do not use getEntity here, we want to delete only in current company
+				$sql .= " AND entity = ".$conf->entity; // Do not use getEntity here, we want to delete only in current company
 
 				dol_syslog(get_class($this)."::delete_boxes", LOG_DEBUG);
 				$resql = $this->db->query($sql);
@@ -1900,7 +1900,7 @@ 
 
 				// If the module is active
 				foreach ($this->rights as $key => $value) {
-					$r_id       = $this->rights[$key][0];	// permission id in llx_rights_def (not unique because primary key is couple id-entity)
+					$r_id       = $this->rights[$key][0]; // permission id in llx_rights_def (not unique because primary key is couple id-entity)
 					$r_desc     = $this->rights[$key][1];
 					$r_type     = isset($this->rights[$key][2]) ? $this->rights[$key][2] : '';
 					$r_def      = empty($this->rights[$key][3]) ? 0 : $this->rights[$key][3];
@@ -2530,36 +2530,36 @@ 
 		}
 
 		if ($this->isCoreOrExternalModule() == 'external' || preg_match('/development|experimental|deprecated/i', $version)) {
-			$versionTitle =  $langs->trans("Version").' '.$this->getVersion(1);
+			$versionTitle = $langs->trans("Version").' '.$this->getVersion(1);
 			if ($this->needUpdate) {
 				$versionTitle .= '<br>'.$langs->trans('ModuleUpdateAvailable').' : '.$this->lastVersion;
 			}
 
-			$return .=  '<span class="info-box-icon-version'.($versiontrans ? ' '.$versiontrans : '').' classfortooltip" title="'.dol_escape_js($versionTitle).'" >';
-			$return .=  $this->getVersion(1);
-			$return .=  '</span>';
+			$return .= '<span class="info-box-icon-version'.($versiontrans ? ' '.$versiontrans : '').' classfortooltip" title="'.dol_escape_js($versionTitle).'" >';
+			$return .= $this->getVersion(1);
+			$return .= '</span>';
 		}
 
-		$return .=  '</div>
+		$return .= '</div>
 	    <div class="info-box-content info-box-text-module'.(!getDolGlobalString($const_name) ? '' : ' info-box-module-enabled'.($versiontrans ? ' info-box-content-warning' : '')).'">
 	    <span class="info-box-title">'.$this->getName().'</span>
 	    <span class="info-box-desc twolinesmax opacitymedium" title="'.dol_escape_htmltag($this->getDesc()).'">'.nl2br($this->getDesc()).'</span>';
 
-		$return .=  '<div class="valignmiddle inline-block info-box-more">';
+		$return .= '<div class="valignmiddle inline-block info-box-more">';
 		//if ($versiontrans) print img_warning($langs->trans("Version").' '.$this->getVersion(1)).' ';
-		$return .=  '<a class="valignmiddle inline-block" href="javascript:document_preview(\''.DOL_URL_ROOT.'/admin/modulehelp.php?id='.((int) $this->numero).'\',\'text/html\',\''.dol_escape_js($langs->trans("Module")).'\')">'.img_picto(($this->isCoreOrExternalModule() == 'external' ? $langs->trans("ExternalModule").' - ' : '').$langs->trans("ClickToShowDescription"), $imginfo).'</a>';
-		$return .=  '</div><br>';
-
-		$return .=  '<div class="valignmiddle inline-block info-box-actions">';
-		$return .=  '<div class="valignmiddle inline-block info-box-setup">';
-		$return .=  $codetoconfig;
-		$return .=  '</div>';
-		$return .=  '<div class="valignmiddle inline-block marginleftonly marginrightonly">';
-		$return .=  $codeenabledisable;
-		$return .=  '</div>';
-		$return .=  '</div>';
-
-		$return .=  '
+		$return .= '<a class="valignmiddle inline-block" href="javascript:document_preview(\''.DOL_URL_ROOT.'/admin/modulehelp.php?id='.((int) $this->numero).'\',\'text/html\',\''.dol_escape_js($langs->trans("Module")).'\')">'.img_picto(($this->isCoreOrExternalModule() == 'external' ? $langs->trans("ExternalModule").' - ' : '').$langs->trans("ClickToShowDescription"), $imginfo).'</a>';
+		$return .= '</div><br>';
+
+		$return .= '<div class="valignmiddle inline-block info-box-actions">';
+		$return .= '<div class="valignmiddle inline-block info-box-setup">';
+		$return .= $codetoconfig;
+		$return .= '</div>';
+		$return .= '<div class="valignmiddle inline-block marginleftonly marginrightonly">';
+		$return .= $codeenabledisable;
+		$return .= '</div>';
+		$return .= '</div>';
+
+		$return .= '
 	    </div><!-- /.info-box-content -->
 	    </div><!-- /.info-box -->
 	    </div>';
@@ -2578,7 +2578,7 @@ 
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 		if (!empty($this->url_last_version)) {
-			$lastVersion = getURLContent($this->url_last_version, 'GET', '', 1, array(), array('http', 'https'), 0);	// Accept http or https links on external remote server only
+			$lastVersion = getURLContent($this->url_last_version, 'GET', '', 1, array(), array('http', 'https'), 0); // Accept http or https links on external remote server only
 			if (isset($lastVersion['content']) && strlen($lastVersion['content']) < 30) {
 				// Security warning :  be careful with remote data content, the module editor could be hacked (or evil) so limit to a-z A-Z 0-9 _ . -
 				$this->lastVersion = preg_replace("/[^a-zA-Z0-9_\.\-]+/", "", $lastVersion['content']);