Completed
Branch develop (448fc1)
by
unknown
17:13
created
doctemplates/websites/website_template-corporate/containers/page186.tpl.php 1 patch
Braces   +7 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,5 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php // BEGIN PHP
2
-$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;
2
+$websitekey=basename(__DIR__); if (empty($websitepagefile)) {
3
+	$websitepagefile=__FILE__;
4
+}
3 5
 if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
4 6
 	$pathdepth = count(explode('/', $_SERVER['SCRIPT_NAME'])) - 2;
5 7
 	require_once ($pathdepth ? str_repeat('../', $pathdepth) : './').'master.inc.php';
@@ -26,7 +28,10 @@  discard block
 block discarded – undo
26 28
 <!-- Include link to JS file -->
27 29
 <script async src="/javascript.js.php"></script>
28 30
 <!-- Include HTML header from common file -->
29
-<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html"; ?>
31
+<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) {
32
+	include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html";
33
+}
34
+?>
30 35
 <!-- Include HTML header from page header block -->
31 36
 
32 37
 </head>
Please login to merge, or discard this patch.
doctemplates/websites/website_template-corporate/containers/page188.tpl.php 1 patch
Braces   +7 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,5 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php // BEGIN PHP
2
-$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;
2
+$websitekey=basename(__DIR__); if (empty($websitepagefile)) {
3
+	$websitepagefile=__FILE__;
4
+}
3 5
 if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
4 6
 	$pathdepth = count(explode('/', $_SERVER['SCRIPT_NAME'])) - 2;
5 7
 	require_once ($pathdepth ? str_repeat('../', $pathdepth) : './').'master.inc.php';
@@ -26,7 +28,10 @@  discard block
 block discarded – undo
26 28
 <!-- Include link to JS file -->
27 29
 <script async src="/javascript.js.php"></script>
28 30
 <!-- Include HTML header from common file -->
29
-<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html"; ?>
31
+<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) {
32
+	include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html";
33
+}
34
+?>
30 35
 <!-- Include HTML header from page header block -->
31 36
 
32 37
 </head>
Please login to merge, or discard this patch.
doctemplates/websites/website_template-corporate/containers/page194.tpl.php 1 patch
Braces   +7 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,5 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php // BEGIN PHP
2
-$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;
2
+$websitekey=basename(__DIR__); if (empty($websitepagefile)) {
3
+	$websitepagefile=__FILE__;
4
+}
3 5
 if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
4 6
 	$pathdepth = count(explode('/', $_SERVER['SCRIPT_NAME'])) - 2;
5 7
 	require_once ($pathdepth ? str_repeat('../', $pathdepth) : './').'master.inc.php';
@@ -26,7 +28,10 @@  discard block
 block discarded – undo
26 28
 <!-- Include link to JS file -->
27 29
 <script async src="/javascript.js.php"></script>
28 30
 <!-- Include HTML header from common file -->
29
-<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html"; ?>
31
+<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) {
32
+	include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html";
33
+}
34
+?>
30 35
 <!-- Include HTML header from page header block -->
31 36
 
32 37
 </head>
Please login to merge, or discard this patch.
doctemplates/websites/website_template-corporate/containers/page184.tpl.php 1 patch
Braces   +7 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,5 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php // BEGIN PHP
2
-$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;
2
+$websitekey=basename(__DIR__); if (empty($websitepagefile)) {
3
+	$websitepagefile=__FILE__;
4
+}
3 5
 if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
4 6
 	$pathdepth = count(explode('/', $_SERVER['SCRIPT_NAME'])) - 2;
5 7
 	require_once ($pathdepth ? str_repeat('../', $pathdepth) : './').'master.inc.php';
@@ -26,7 +28,10 @@  discard block
 block discarded – undo
26 28
 <!-- Include link to JS file -->
27 29
 <script async src="/javascript.js.php"></script>
28 30
 <!-- Include HTML header from common file -->
29
-<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html"; ?>
31
+<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) {
32
+	include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html";
33
+}
34
+?>
30 35
 <!-- Include HTML header from page header block -->
31 36
 
32 37
 </head>
Please login to merge, or discard this patch.
doctemplates/websites/website_template-corporate/containers/page182.tpl.php 1 patch
Braces   +7 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,5 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php // BEGIN PHP
2
-$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;
2
+$websitekey=basename(__DIR__); if (empty($websitepagefile)) {
3
+	$websitepagefile=__FILE__;
4
+}
3 5
 if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
4 6
 	$pathdepth = count(explode('/', $_SERVER['SCRIPT_NAME'])) - 2;
5 7
 	require_once ($pathdepth ? str_repeat('../', $pathdepth) : './').'master.inc.php';
@@ -26,7 +28,10 @@  discard block
 block discarded – undo
26 28
 <!-- Include link to JS file -->
27 29
 <script async src="/javascript.js.php"></script>
28 30
 <!-- Include HTML header from common file -->
29
-<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html"; ?>
31
+<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) {
32
+	include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html";
33
+}
34
+?>
30 35
 <!-- Include HTML header from page header block -->
31 36
 
32 37
 </head>
Please login to merge, or discard this patch.
doctemplates/websites/website_template-corporate/containers/page185.tpl.php 1 patch
Braces   +7 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,5 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php // BEGIN PHP
2
-$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;
2
+$websitekey=basename(__DIR__); if (empty($websitepagefile)) {
3
+	$websitepagefile=__FILE__;
4
+}
3 5
 if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
4 6
 	$pathdepth = count(explode('/', $_SERVER['SCRIPT_NAME'])) - 2;
5 7
 	require_once ($pathdepth ? str_repeat('../', $pathdepth) : './').'master.inc.php';
@@ -26,7 +28,10 @@  discard block
 block discarded – undo
26 28
 <!-- Include link to JS file -->
27 29
 <script async src="/javascript.js.php"></script>
28 30
 <!-- Include HTML header from common file -->
29
-<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html"; ?>
31
+<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) {
32
+	include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html";
33
+}
34
+?>
30 35
 <!-- Include HTML header from page header block -->
31 36
 
32 37
 </head>
Please login to merge, or discard this patch.
doctemplates/websites/website_template-corporate/containers/page183.tpl.php 1 patch
Braces   +7 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,5 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php // BEGIN PHP
2
-$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;
2
+$websitekey=basename(__DIR__); if (empty($websitepagefile)) {
3
+	$websitepagefile=__FILE__;
4
+}
3 5
 if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
4 6
 	$pathdepth = count(explode('/', $_SERVER['SCRIPT_NAME'])) - 2;
5 7
 	require_once ($pathdepth ? str_repeat('../', $pathdepth) : './').'master.inc.php';
@@ -26,7 +28,10 @@  discard block
 block discarded – undo
26 28
 <!-- Include link to JS file -->
27 29
 <script async src="/javascript.js.php"></script>
28 30
 <!-- Include HTML header from common file -->
29
-<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html"; ?>
31
+<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) {
32
+	include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html";
33
+}
34
+?>
30 35
 <!-- Include HTML header from page header block -->
31 36
 
32 37
 </head>
Please login to merge, or discard this patch.
doctemplates/websites/website_template-corporate/containers/page187.tpl.php 1 patch
Braces   +7 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,5 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php // BEGIN PHP
2
-$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;
2
+$websitekey=basename(__DIR__); if (empty($websitepagefile)) {
3
+	$websitepagefile=__FILE__;
4
+}
3 5
 if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
4 6
 	$pathdepth = count(explode('/', $_SERVER['SCRIPT_NAME'])) - 2;
5 7
 	require_once ($pathdepth ? str_repeat('../', $pathdepth) : './').'master.inc.php';
@@ -26,7 +28,10 @@  discard block
 block discarded – undo
26 28
 <!-- Include link to JS file -->
27 29
 <script async src="/javascript.js.php"></script>
28 30
 <!-- Include HTML header from common file -->
29
-<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html"; ?>
31
+<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) {
32
+	include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html";
33
+}
34
+?>
30 35
 <!-- Include HTML header from page header block -->
31 36
 
32 37
 </head>
Please login to merge, or discard this patch.
htdocs/includes/odtphp/odf.php 1 patch
Braces   +31 added lines, -10 removed lines patch added patch discarded remove patch
@@ -78,7 +78,10 @@  discard block
 block discarded – undo
78 78
 		}
79 79
 
80 80
 		$md5uniqid = md5(uniqid());
81
-		if ($this->config['PATH_TO_TMP']) $this->tmpdir = preg_replace('|[\/]$|', '', $this->config['PATH_TO_TMP']);	// Remove last \ or /
81
+		if ($this->config['PATH_TO_TMP']) {
82
+			$this->tmpdir = preg_replace('|[\/]$|', '', $this->config['PATH_TO_TMP']);
83
+		}
84
+		// Remove last \ or /
82 85
 		$this->tmpdir .= ($this->tmpdir?'/':'').$md5uniqid;
83 86
 		$this->tmpfile = $this->tmpdir.'/'.$md5uniqid.'.odt';	// We keep .odt extension to allow OpenOffice usage during debug.
84 87
 
@@ -94,7 +97,9 @@  discard block
 block discarded – undo
94 97
 
95 98
 		// Load zip proxy
96 99
 		$zipHandler = $this->config['ZIP_PROXY'];
97
-		if (!defined('PCLZIP_TEMPORARY_DIR')) define('PCLZIP_TEMPORARY_DIR', $this->tmpdir);
100
+		if (!defined('PCLZIP_TEMPORARY_DIR')) {
101
+			define('PCLZIP_TEMPORARY_DIR', $this->tmpdir);
102
+		}
98 103
 		include_once 'zip/'.$zipHandler.'.php';
99 104
 		if (! class_exists($this->config['ZIP_PROXY'])) {
100 105
 			throw new OdfException($this->config['ZIP_PROXY'] . ' class not found - check your php settings');
@@ -236,8 +241,12 @@  discard block
 block discarded – undo
236 241
 	 */
237 242
 	private function _replaceHtmlWithOdtTag($tags, &$customStyles, &$fontDeclarations, $encode = false, $charset = '')
238 243
 	{
239
-		if ($customStyles == null) $customStyles = array();
240
-		if ($fontDeclarations == null) $fontDeclarations = array();
244
+		if ($customStyles == null) {
245
+			$customStyles = array();
246
+		}
247
+		if ($fontDeclarations == null) {
248
+			$fontDeclarations = array();
249
+		}
241 250
 
242 251
 		$odtResult = '';
243 252
 
@@ -595,7 +604,9 @@  discard block
 block discarded – undo
595 604
 				$reg = '@\[!--\sIF\s' . $key . '\s--\](.*)(\[!--\sELSE\s' . $key . '\s--\](.*))?\[!--\sENDIF\s' . $key . '\s--\]@smU'; // U modifier = all quantifiers are non-greedy
596 605
 				preg_match_all($reg, $this->contentXml, $matches, PREG_SET_ORDER);
597 606
 				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
598
-					if (!empty($match[3])) $this->contentXml = str_replace($match[0], $match[3], $this->contentXml);
607
+					if (!empty($match[3])) {
608
+						$this->contentXml = str_replace($match[0], $match[3], $this->contentXml);
609
+					}
599 610
 				}
600 611
 				// Cleanup the other conditional blocks (all the others where there were no ELSE clause, we can just remove them altogether)
601 612
 				$this->contentXml = preg_replace($reg, '', $this->contentXml);
@@ -608,9 +619,15 @@  discard block
 block discarded – undo
608 619
 		}
609 620
 
610 621
 		// Static substitution
611
-		if ($type == 'content')	$this->contentXml = str_replace(array_keys($this->vars), array_values($this->vars), $this->contentXml);
612
-		if ($type == 'styles')	$this->stylesXml = str_replace(array_keys($this->vars), array_values($this->vars), $this->stylesXml);
613
-		if ($type == 'meta')	$this->metaXml = str_replace(array_keys($this->vars), array_values($this->vars), $this->metaXml);
622
+		if ($type == 'content') {
623
+			$this->contentXml = str_replace(array_keys($this->vars), array_values($this->vars), $this->contentXml);
624
+		}
625
+		if ($type == 'styles') {
626
+			$this->stylesXml = str_replace(array_keys($this->vars), array_values($this->vars), $this->stylesXml);
627
+		}
628
+		if ($type == 'meta') {
629
+			$this->metaXml = str_replace(array_keys($this->vars), array_values($this->vars), $this->metaXml);
630
+		}
614 631
 	}
615 632
 
616 633
 	/**
@@ -751,7 +768,9 @@  discard block
 block discarded – undo
751 768
 	 */
752 769
 	public function setMetaData()
753 770
 	{
754
-		if (empty($this->creator)) $this->creator='';
771
+		if (empty($this->creator)) {
772
+			$this->creator='';
773
+		}
755 774
 
756 775
 		$this->metaXml = preg_replace('/<dc:date>.*<\/dc:date>/', '<dc:date>'.gmdate("Y-m-d\TH:i:s").'</dc:date>', $this->metaXml);
757 776
 		$this->metaXml = preg_replace('/<dc:creator>.*<\/dc:creator>/', '<dc:creator>'.htmlspecialchars($this->creator).'</dc:creator>', $this->metaXml);
@@ -819,7 +838,9 @@  discard block
 block discarded – undo
819 838
 	{
820 839
 		global $conf;
821 840
 
822
-		if ( $name == "" ) $name = "temp".md5(uniqid());
841
+		if ( $name == "" ) {
842
+			$name = "temp".md5(uniqid());
843
+		}
823 844
 
824 845
 		dol_syslog(get_class($this).'::exportAsAttachedPDF $name='.$name, LOG_DEBUG);
825 846
 		$this->saveToDisk($name);
Please login to merge, or discard this patch.