Dolibarr / dolibarr

dev/tools/test/namespacemig/bbb.class.php

Braces +3 added lines, -1 removed lines

@@ -25,9 +25,11 @@
 	 *
 	 * @return void
 	 */
-	public function do()
+	public function do {
+		()
 	{
 		global $globalaaa, $globalbbb;
+	}
 		echo 'dobbb'."\n";
 		$globalaaa.='+bbb';
 		$globalbbb.='+bbb';

dev/tools/test/namespacemig/aaa.class.php

Braces +3 added lines, -1 removed lines

@@ -27,8 +27,10 @@
 	 *
 	 * @return void
 	 */
-	public function do()
+	public function do {
+		()
 	{
 		echo 'doaaa'."\n";
 	}
+	}
 }

htdocs/install/doctemplates/websites/website_template-noimg/containers/master.inc.php

Braces +3 added lines, -1 removed lines

@@ -1,6 +1,8 @@
 <?php
 // File generated to link to the master file - DO NOT MODIFY - It is just an include
 if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
-	if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
+	if (! defined('USEEXTERNALSERVER')) {
+		define('USEEXTERNALSERVER', 1);
+	}
 	require_once '/var/www/html/dolibarr_dev/htdocs/master.inc.php';
 }

htdocs/install/doctemplates/websites/website_template-restaurant/containers/master.inc.php

Braces +3 added lines, -1 removed lines

@@ -1,7 +1,9 @@
 <?php
 // File generated to link to the master file - DO NOT MODIFY - It is just an include
 if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
-    if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
+    if (! defined('USEEXTERNALSERVER')) {
+    	define('USEEXTERNALSERVER', 1);
+    }
     require_once '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php';
 }
 ?>

htdocs/install/doctemplates/websites/website_template-stellar/containers/master.inc.php

Braces +3 added lines, -1 removed lines

@@ -1,6 +1,8 @@
 <?php
 // File generated to link to the master file - DO NOT MODIFY - It is just an include
 if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
-	if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
+	if (! defined('USEEXTERNALSERVER')) {
+		define('USEEXTERNALSERVER', 1);
+	}
 	require_once '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php';
 }

htdocs/install/doctemplates/websites/website_template-stellar/containers/wrapper.php

Braces +57 added lines, -21 removed lines

@@ -1,7 +1,9 @@ 
 <?php
 // BEGIN PHP File wrapper.php - DO NOT MODIFY - It is just a copy of file website/samples/wrapper.php
 $websitekey = basename(__DIR__);
-if (strpos($_SERVER["PHP_SELF"], 'website/samples/wrapper.php')) die("Sample file for website module. Can be called directly.");
+if (strpos($_SERVER["PHP_SELF"], 'website/samples/wrapper.php')) {
+	die("Sample file for website module. Can be called directly.");
+}
 if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load master if not already loaded
 include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
@@ -17,7 +19,9 @@ 
 
 // Parameters for RSS
 $rss = GETPOST('rss', 'aZ09');
-if ($rss) $original_file = 'blog.rss';
+if ($rss) {
+	$original_file = 'blog.rss';
+}
 
 // If we have a hash public (hashp), we guess the original_file.
 if (!empty($hashp)) {
@@ -52,14 +56,23 @@ 
 
 // Define attachment (attachment=true to force choice popup 'open'/'save as')
 $attachment = true;
-if (preg_match('/\.(html|htm)$/i', $original_file)) $attachment = false;
-if (isset($_GET["attachment"])) $attachment = (GETPOST("attachment", 'alphanohtml') ? true : false);
-if (!empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS_WEBSITE)) $attachment = false;
+if (preg_match('/\.(html|htm)$/i', $original_file)) {
+	$attachment = false;
+}
+if (isset($_GET["attachment"])) {
+	$attachment = (GETPOST("attachment", 'alphanohtml') ? true : false);
+}
+if (!empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS_WEBSITE)) {
+	$attachment = false;
+}
 
 // Define mime type
 $type = 'application/octet-stream';
-if (GETPOSTISSET('type')) $type = GETPOST('type', 'alpha');
-else $type = dol_mimetype($original_file);
+if (GETPOSTISSET('type')) {
+	$type = GETPOST('type', 'alpha');
+} else {
+	$type = dol_mimetype($original_file);
+}
 
 // Security: Delete string ../ into $original_file
 $original_file = str_replace("../", "/", $original_file);
@@ -90,7 +103,9 @@ 
 	$website->fetch('', $websitekey);
 
 	$filters = array('type_container'=>'blogpost');
-	if ($l) $filters['lang'] = $l;
+	if ($l) {
+		$filters['lang'] = $l;
+	}
 
 	$MAXNEWS = ($limit ? $limit : 20);
 	$arrayofblogs = $websitepage->fetchAll($website->id, 'DESC', 'date_creation', $MAXNEWS, 0, $filters);
@@ -143,8 +158,9 @@ 
 		$result = build_rssfile($format, $title, $desc, $eventarray, $outputfiletmp, '', $website->virtualhost.'/wrapper.php?rss=1'.($l ? '&l='.$l : ''), $l);
 
 		if ($result >= 0) {
-			if (dol_move($outputfiletmp, $outputfile, 0, 1, 0, 0)) $result = 1;
-			else {
+			if (dol_move($outputfiletmp, $outputfile, 0, 1, 0, 0)) {
+				$result = 1;
+			} else {
 				$error = 'Failed to rename '.$outputfiletmp.' into '.$outputfile;
 				dol_syslog("build_exportfile ".$error, LOG_ERR);
 				dol_delete_file($outputfiletmp, 0, 1);
@@ -162,26 +178,39 @@ 
 
 	if ($result >= 0) {
 		$attachment = false;
-		if (isset($_GET["attachment"])) $attachment = $_GET["attachment"];
+		if (isset($_GET["attachment"])) {
+			$attachment = $_GET["attachment"];
+		}
 		//$attachment = false;
 		$contenttype = 'application/rss+xml';
-		if (isset($_GET["contenttype"])) $contenttype = $_GET["contenttype"];
+		if (isset($_GET["contenttype"])) {
+			$contenttype = $_GET["contenttype"];
+		}
 		//$contenttype='text/plain';
 		$outputencoding = 'UTF-8';
 
-		if ($contenttype)       header('Content-Type: '.$contenttype.($outputencoding ? '; charset='.$outputencoding : ''));
-		if ($attachment) 		header('Content-Disposition: attachment; filename="'.$filename.'"');
+		if ($contenttype) {
+			header('Content-Type: '.$contenttype.($outputencoding ? '; charset='.$outputencoding : ''));
+		}
+		if ($attachment) {
+			header('Content-Disposition: attachment; filename="'.$filename.'"');
+		}
 
 		// Ajout directives pour resoudre bug IE
 		//header('Cache-Control: Public, must-revalidate');
 		//header('Pragma: public');
-		if ($cachedelay) header('Cache-Control: max-age='.$cachedelay.', private, must-revalidate');
-		else header('Cache-Control: private, must-revalidate');
+		if ($cachedelay) {
+			header('Cache-Control: max-age='.$cachedelay.', private, must-revalidate');
+		} else {
+			header('Cache-Control: private, must-revalidate');
+		}
 
 		// Clean parameters
 		$outputfile = $dir_temp.'/'.$filename;
 		$result = readfile($outputfile);
-		if (!$result) print 'File '.$outputfile.' was empty.';
+		if (!$result) {
+			print 'File '.$outputfile.' was empty.';
+		}
 
 		// header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
 		exit;
@@ -227,13 +256,20 @@ 
 	//top_httphead($type);
 	header('Content-Type: '.$type);
 	header('Content-Description: File Transfer');
-	if ($encoding)   header('Content-Encoding: '.$encoding);
+	if ($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.'"');
-	else header('Content-Disposition: inline; filename="'.$filename.'"');
+	if ($attachment) {
+		header('Content-Disposition: attachment; filename="'.$filename.'"');
+	} else {
+		header('Content-Disposition: inline; filename="'.$filename.'"');
+	}
 	header('Content-Length: '.dol_filesize($fullpath_original_file));
 
 	readfile($fullpath_original_file_osencoded);
 }
-if (is_object($db)) $db->close();
+if (is_object($db)) {
+	$db->close();
+}
 // END PHP

htdocs/includes/odtphp/zip/PclZipProxy.php

Braces +7 added lines, -2 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if (! defined('ODTPHP_PATHTOPCLZIP')) define('ODTPHP_PATHTOPCLZIP','pclzip/');
+if (! defined('ODTPHP_PATHTOPCLZIP')) {
+	define('ODTPHP_PATHTOPCLZIP','pclzip/');
+}
 require_once ODTPHP_PATHTOPCLZIP.'pclzip.lib.php';
 require_once 'ZipInterface.php';
 class PclZipProxyException extends Exception
@@ -32,7 +34,10 @@ 
 			throw new PclZipProxyException('PclZip class not loaded - PclZip library
 			 is required for using PclZipProxy'); ;
 		}
-		if ($forcedir) $this->tmpdir=preg_replace('|[//\/]$|','',$forcedir);	// $this->tmpdir must not contains / at the end
+		if ($forcedir) {
+			$this->tmpdir=preg_replace('|[//\/]$|','',$forcedir);
+		}
+		// $this->tmpdir must not contains / at the end
 	}
 
 	/**

htdocs/includes/odtphp/Segment.php

Braces +12 added lines, -4 removed lines

@@ -88,10 +88,16 @@ 
 	{
 		// To provide debug information on line number processed
 		global $count;
-		if (empty($count)) $count=1;
-		else $count++;
+		if (empty($count)) {
+			$count=1;
+		} else {
+			$count++;
+		}
 
-		if (empty($this->savxml)) $this->savxml = $this->xml;       // Sav content of line at first line merged, so we will reuse original for next steps
+		if (empty($this->savxml)) {
+			$this->savxml = $this->xml;
+		}
+		// Sav content of line at first line merged, so we will reuse original for next steps
 		$this->xml = $this->savxml;
 		$tmpvars = $this->vars;                                     // Store into $tmpvars so we won't modify this->vars when completing data with empty values
 
@@ -123,7 +129,9 @@ 
 				$reg = '@\[!--\sIF\s' . $key . '\s--\](.*)(\[!--\sELSE\s' . $key . '\s--\](.*))?\[!--\sENDIF\s' . $key . '\s--\]@smU'; // U modifier = all quantifiers are non-greedy
 				preg_match_all($reg, $this->xml, $matches, PREG_SET_ORDER);
 				foreach ($matches as $match) { // For each match, if there is an ELSE clause, we replace the whole block by the value in the ELSE clause
-					if (!empty($match[3])) $this->xml = str_replace($match[0], $match[3], $this->xml);
+					if (!empty($match[3])) {
+						$this->xml = str_replace($match[0], $match[3], $this->xml);
+					}
 				}
 				// Cleanup the other conditional blocks (all the others where there were no ELSE clause, we can just remove them altogether)
 				$this->xml = preg_replace($reg, '', $this->xml);

htdocs/includes/sabre/sabre/dav/lib/CalDAV/Xml/Filter/ParamFilter.php

Switch Indentation +10 added lines, -10 removed lines

@@ -60,16 +60,16 @@
         if (is_array($elems)) {
             foreach ($elems as $elem) {
                 switch ($elem['name']) {
-                case '{'.Plugin::NS_CALDAV.'}is-not-defined':
-                    $result['is-not-defined'] = true;
-                    break;
-                case '{'.Plugin::NS_CALDAV.'}text-match':
-                    $result['text-match'] = [
-                        'negate-condition' => isset($elem['attributes']['negate-condition']) && 'yes' === $elem['attributes']['negate-condition'],
-                        'collation' => isset($elem['attributes']['collation']) ? $elem['attributes']['collation'] : 'i;ascii-casemap',
-                        'value' => $elem['value'],
-                    ];
-                    break;
+                	case '{'.Plugin::NS_CALDAV.'}is-not-defined':
+                    	$result['is-not-defined'] = true;
+                    	break;
+                	case '{'.Plugin::NS_CALDAV.'}text-match':
+                    	$result['text-match'] = [
+                        	'negate-condition' => isset($elem['attributes']['negate-condition']) && 'yes' === $elem['attributes']['negate-condition'],
+                        	'collation' => isset($elem['attributes']['collation']) ? $elem['attributes']['collation'] : 'i;ascii-casemap',
+                        	'value' => $elem['value'],
+                    	];
+                    	break;
             }
             }
         }