Passed
Push — master ( a3c0d0...678db7 )
by Cody
06:27 queued 03:12
created
opml.php 3 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
2
+	set_include_path(dirname(__FILE__)."/include".PATH_SEPARATOR.
3 3
 		get_include_path());
4 4
 
5 5
 	require_once "autoload.php";
@@ -14,11 +14,11 @@  discard block
 block discarded – undo
14 14
 
15 15
 	$op = $_REQUEST['op'];
16 16
 
17
-	if ($op == "publish"){
17
+	if ($op == "publish") {
18 18
 		$key = $_REQUEST["key"];
19 19
 		$pdo = Db::pdo();
20 20
 
21
-		$sth = $pdo->prepare( "SELECT owner_uid
21
+		$sth = $pdo->prepare("SELECT owner_uid
22 22
 				FROM ttrss_access_keys WHERE
23 23
 				access_key = ? AND feed_id = 'OPML:Publish'");
24 24
 		$sth->execute([$key]);
Please login to merge, or discard this patch.
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -1,35 +1,35 @@
 block discarded – undo
1 1
 <?php
2
-	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
3
-		get_include_path());
2
+    set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
3
+        get_include_path());
4 4
 
5
-	require_once "autoload.php";
6
-	require_once "functions.php";
7
-	require_once "sessions.php";
8
-	require_once "sanity_check.php";
9
-	require_once "config.php";
10
-	require_once "db.php";
11
-	require_once "db-prefs.php";
5
+    require_once "autoload.php";
6
+    require_once "functions.php";
7
+    require_once "sessions.php";
8
+    require_once "sanity_check.php";
9
+    require_once "config.php";
10
+    require_once "db.php";
11
+    require_once "db-prefs.php";
12 12
 
13
-	if (!init_plugins()) return;
13
+    if (!init_plugins()) return;
14 14
 
15
-	$op = $_REQUEST['op'];
15
+    $op = $_REQUEST['op'];
16 16
 
17
-	if ($op == "publish"){
18
-		$key = $_REQUEST["key"];
19
-		$pdo = Db::pdo();
17
+    if ($op == "publish"){
18
+        $key = $_REQUEST["key"];
19
+        $pdo = Db::pdo();
20 20
 
21
-		$sth = $pdo->prepare( "SELECT owner_uid
21
+        $sth = $pdo->prepare( "SELECT owner_uid
22 22
 				FROM ttrss_access_keys WHERE
23 23
 				access_key = ? AND feed_id = 'OPML:Publish'");
24
-		$sth->execute([$key]);
24
+        $sth->execute([$key]);
25 25
 
26
-		if ($row = $sth->fetch()) {
27
-			$owner_uid = $row['owner_uid'];
26
+        if ($row = $sth->fetch()) {
27
+            $owner_uid = $row['owner_uid'];
28 28
 
29
-			$opml = new Opml($_REQUEST);
30
-			$opml->opml_export("", $owner_uid, true, false);
29
+            $opml = new Opml($_REQUEST);
30
+            $opml->opml_export("", $owner_uid, true, false);
31 31
 
32
-		} else {
33
-			print "<error>User not found</error>";
34
-		}
35
-	}
32
+        } else {
33
+            print "<error>User not found</error>";
34
+        }
35
+    }
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -10,7 +10,9 @@
 block discarded – undo
10 10
 	require_once "db.php";
11 11
 	require_once "db-prefs.php";
12 12
 
13
-	if (!init_plugins()) return;
13
+	if (!init_plugins()) {
14
+	    return;
15
+	}
14 16
 
15 17
 	$op = $_REQUEST['op'];
16 18
 
Please login to merge, or discard this patch.
lib/MiniTemplator.class.php 4 patches
Switch Indentation   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -295,23 +295,23 @@  discard block
 block discarded – undo
295 295
    if (!$this->parseWord($cmdL,$p,$cmd)) return true;
296 296
    $parms = substr($cmdL,$p);
297 297
    switch (strtoupper($cmd)) {
298
-      case '$BEGINBLOCK':
299
-         if (!$this->processBeginBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd))
300
-            return false;
301
-         break;
302
-      case '$ENDBLOCK':
303
-         if (!$this->processEndBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd))
304
-            return false;
305
-         break;
306
-      case '$INCLUDE':
307
-         if (!$this->processincludeCmd($parms,$cmdTPosBegin,$cmdTPosEnd))
308
-            return false;
309
-         $resumeFromStart = true;
310
-         break;
311
-      default:
312
-         if ($cmd{0} == '$' && !(strlen($cmd) >= 2 && $cmd{1} == '{')) {
313
-            $this->triggerError ("Unknown command \"$cmd\" in template at offset $cmdTPosBegin.");
314
-            return false; }}
298
+   case '$BEGINBLOCK':
299
+      if (!$this->processBeginBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd))
300
+         return false;
301
+      break;
302
+   case '$ENDBLOCK':
303
+      if (!$this->processEndBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd))
304
+         return false;
305
+      break;
306
+   case '$INCLUDE':
307
+      if (!$this->processincludeCmd($parms,$cmdTPosBegin,$cmdTPosEnd))
308
+         return false;
309
+      $resumeFromStart = true;
310
+      break;
311
+   default:
312
+      if ($cmd{0} == '$' && !(strlen($cmd) >= 2 && $cmd{1} == '{')) {
313
+         $this->triggerError ("Unknown command \"$cmd\" in template at offset $cmdTPosBegin.");
314
+         return false; }}
315 315
     return true; }
316 316
 
317 317
 /**
@@ -765,25 +765,25 @@  discard block
 block discarded – undo
765 765
       if ($tPos2 > $tPos)
766 766
          $this->writeString (substr($this->template,$tPos,$tPos2-$tPos));
767 767
       switch ($kind) {
768
-         case 0:         // end of block
769
-            return;
770
-         case 1:         // variable
771
-            $vrtr =& $this->varRefTab[$varRefNo];
772
-            if ($vrtr['blockNo'] != $blockNo)
773
-               $this->programLogicError (4);
774
-            $variableValue = $bitr['blockVarTab'][$vrtr['blockVarNo']];
775
-            $this->writeString ($variableValue);
776
-            $tPos = $vrtr['tPosEnd'];
777
-            $varRefNo += 1;
778
-            break;
779
-         case 2:         // sub block
780
-            $subBtr =& $this->blockTab[$subBlockNo];
781
-            if ($subBtr['parentBlockNo'] != $blockNo)
782
-               $this->programLogicError (3);
783
-            $this->writeBlockInstances ($subBlockNo, $bitr['instanceLevel']);  // recursive call
784
-            $tPos = $subBtr['tPosEnd'];
785
-            $subBlockNo += 1;
786
-            break; }}}
768
+      case 0:         // end of block
769
+         return;
770
+      case 1:         // variable
771
+         $vrtr =& $this->varRefTab[$varRefNo];
772
+         if ($vrtr['blockNo'] != $blockNo)
773
+            $this->programLogicError (4);
774
+         $variableValue = $bitr['blockVarTab'][$vrtr['blockVarNo']];
775
+         $this->writeString ($variableValue);
776
+         $tPos = $vrtr['tPosEnd'];
777
+         $varRefNo += 1;
778
+         break;
779
+      case 2:         // sub block
780
+         $subBtr =& $this->blockTab[$subBlockNo];
781
+         if ($subBtr['parentBlockNo'] != $blockNo)
782
+            $this->programLogicError (3);
783
+         $this->writeBlockInstances ($subBlockNo, $bitr['instanceLevel']);  // recursive call
784
+         $tPos = $subBtr['tPosEnd'];
785
+         $subBlockNo += 1;
786
+         break; }}}
787 787
 
788 788
 /**
789 789
 * @access private
@@ -791,17 +791,17 @@  discard block
 block discarded – undo
791 791
 function writeString ($s) {
792 792
    if ($this->outputError) return;
793 793
    switch ($this->outputMode) {
794
-      case 0:            // output to PHP output stream
795
-         if (!print($s))
796
-            $this->outputError = true;
797
-         break;
798
-      case 1:            // output to file
799
-         $rc = fwrite($this->outputFileHandle, $s);
800
-         if ($rc === false) $this->outputError = true;
801
-         break;
802
-      case 2:            // output to string
803
-         $this->outputString .= $s;
804
-         break; }}
794
+   case 0:            // output to PHP output stream
795
+      if (!print($s))
796
+         $this->outputError = true;
797
+      break;
798
+   case 1:            // output to file
799
+      $rc = fwrite($this->outputFileHandle, $s);
800
+      if ($rc === false) $this->outputError = true;
801
+      break;
802
+   case 2:            // output to string
803
+      $this->outputString .= $s;
804
+      break; }}
805 805
 
806 806
 //--- name lookup routines ------------------------------------------------------------------------------------------
807 807
 
Please login to merge, or discard this patch.
Spacing   +165 added lines, -165 removed lines patch added patch discarded remove patch
@@ -89,16 +89,16 @@  discard block
 block discarded – undo
89 89
 * @access private
90 90
 */
91 91
 
92
-var $maxNestingLevel = 50;            // maximum number of block nestings
93
-var $maxInclTemplateSize = 1000000;   // maximum length of template string when including subtemplates
94
-var $template;                        // Template file data
95
-var $varTab;                          // variables table, array index is variable no
92
+var $maxNestingLevel = 50; // maximum number of block nestings
93
+var $maxInclTemplateSize = 1000000; // maximum length of template string when including subtemplates
94
+var $template; // Template file data
95
+var $varTab; // variables table, array index is variable no
96 96
     // Fields:
97 97
     //  varName                       // variable name
98 98
     //  varValue                      // variable value
99
-var $varTabCnt;                       // no of entries used in VarTab
100
-var $varNameToNoMap;                  // maps variable names to variable numbers
101
-var $varRefTab;                       // variable references table
99
+var $varTabCnt; // no of entries used in VarTab
100
+var $varNameToNoMap; // maps variable names to variable numbers
101
+var $varRefTab; // variable references table
102 102
     // Contains an entry for each variable reference in the template. Ordered by TemplatePos.
103 103
     // Fields:
104 104
     //  varNo                         // variable no
@@ -106,8 +106,8 @@  discard block
 block discarded – undo
106 106
     //  tPosEnd                       // template position of end of variable reference
107 107
     //  blockNo                       // block no of the (innermost) block that contains this variable reference
108 108
     //  blockVarNo                    // block variable no. Index into BlockInstTab.BlockVarTab
109
-var $varRefTabCnt;                    // no of entries used in VarRefTab
110
-var $blockTab;                        // Blocks table, array index is block no
109
+var $varRefTabCnt; // no of entries used in VarRefTab
110
+var $blockTab; // Blocks table, array index is block no
111 111
     // Contains an entry for each block in the template. Ordered by TPosBegin.
112 112
     // Fields:
113 113
     //  blockName                     // block name
@@ -126,12 +126,12 @@  discard block
 block discarded – undo
126 126
     //  blockVarCnt                   // no of variables in block
127 127
     //  blockVarNoToVarNoMap          // maps block variable numbers to variable numbers
128 128
     //  firstVarRefNo                 // variable reference no of first variable of this block or -1
129
-var $blockTabCnt;                     // no of entries used in BlockTab
130
-var $blockNameToNoMap;                // maps block names to block numbers
129
+var $blockTabCnt; // no of entries used in BlockTab
130
+var $blockNameToNoMap; // maps block names to block numbers
131 131
 var $openBlocksTab;
132 132
     // During parsing, this table contains the block numbers of the open parent blocks (nested outer blocks).
133 133
     // Indexed by the block nesting level.
134
-var $blockInstTab;                    // block instances table
134
+var $blockInstTab; // block instances table
135 135
     // This table contains an entry for each block instance that has been added.
136 136
     // Indexed by BlockInstNo.
137 137
     // Fields:
@@ -143,14 +143,14 @@  discard block
 block discarded – undo
143 143
     //  nextBlockInstNo               // pointer to next instance of this block or -1
144 144
     //     Forward chain for instances of same block.
145 145
     //  blockVarTab                   // block instance variables
146
-var $blockInstTabCnt;                 // no of entries used in BlockInstTab
146
+var $blockInstTabCnt; // no of entries used in BlockInstTab
147 147
 
148
-var $currentNestingLevel;             // Current block nesting level during parsing.
149
-var $templateValid;                   // true if a valid template is prepared
150
-var $outputMode;                      // 0 = to PHP output stream, 1 = to file, 2 = to string
151
-var $outputFileHandle;                // file handle during writing of output file
152
-var $outputError;                     // true when an output error occurred
153
-var $outputString;                    // string buffer for the generated HTML page
148
+var $currentNestingLevel; // Current block nesting level during parsing.
149
+var $templateValid; // true if a valid template is prepared
150
+var $outputMode; // 0 = to PHP output stream, 1 = to file, 2 = to string
151
+var $outputFileHandle; // file handle during writing of output file
152
+var $outputError; // true when an output error occurred
153
+var $outputString; // string buffer for the generated HTML page
154 154
 
155 155
 /**#@-*/
156 156
 
@@ -171,9 +171,9 @@  discard block
 block discarded – undo
171 171
 * @return boolean  true on success, false on error.
172 172
 * @access public
173 173
 */
174
-function readTemplateFromFile ($fileName) {
175
-   if (!$this->readFileIntoString($fileName,$s)) {
176
-      $this->triggerError ("Error while reading template file " . $fileName . ".");
174
+function readTemplateFromFile($fileName) {
175
+   if (!$this->readFileIntoString($fileName, $s)) {
176
+      $this->triggerError("Error while reading template file ".$fileName.".");
177 177
       return false; }
178 178
    if (!$this->setTemplateString($s)) return false;
179 179
    return true; }
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
 * @return boolean  true on success, false on error.
185 185
 * @access public
186 186
 */
187
-function setTemplateString ($templateString) {
187
+function setTemplateString($templateString) {
188 188
    $this->templateValid = false;
189 189
    $this->template = $templateString;
190 190
    if (!$this->parseTemplate()) return false;
@@ -197,10 +197,10 @@  discard block
 block discarded – undo
197 197
 * @return boolean  true on success, false on error.
198 198
 * @access private
199 199
 */
200
-function loadSubtemplate ($subtemplateName, &$s) {
201
-   $subtemplateFileName = $this->combineFileSystemPath($this->subtemplateBasePath,$subtemplateName);
202
-   if (!$this->readFileIntoString($subtemplateFileName,$s)) {
203
-      $this->triggerError ("Error while reading subtemplate file " . $subtemplateFileName . ".");
200
+function loadSubtemplate($subtemplateName, &$s) {
201
+   $subtemplateFileName = $this->combineFileSystemPath($this->subtemplateBasePath, $subtemplateName);
202
+   if (!$this->readFileIntoString($subtemplateFileName, $s)) {
203
+      $this->triggerError("Error while reading subtemplate file ".$subtemplateFileName.".");
204 204
       return false; }
205 205
    return true; }
206 206
 
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
243 243
 function beginMainBlock() {
244 244
    $blockNo = 0;
245 245
    $this->registerBlock('@@InternalMainBlock@@', $blockNo);
246
-   $bte =& $this->blockTab[$blockNo];
246
+   $bte = & $this->blockTab[$blockNo];
247 247
    $bte['tPosBegin'] = 0;
248 248
    $bte['tPosContentsBegin'] = 0;
249 249
    $bte['nestingLevel'] = 0;
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
 * @access private
258 258
 */
259 259
 function endMainBlock() {
260
-   $bte =& $this->blockTab[0];
260
+   $bte = & $this->blockTab[0];
261 261
    $bte['tPosContentsEnd'] = strlen($this->template);
262 262
    $bte['tPosEnd'] = strlen($this->template);
263 263
    $bte['definitionIsOpen'] = false;
@@ -271,15 +271,15 @@  discard block
 block discarded – undo
271 271
 function parseTemplateCommands() {
272 272
    $p = 0;
273 273
    while (true) {
274
-      $p0 = strpos($this->template,'<!--',$p);
274
+      $p0 = strpos($this->template, '<!--', $p);
275 275
       if ($p0 === false) break;
276
-      $p = strpos($this->template,'-->',$p0);
276
+      $p = strpos($this->template, '-->', $p0);
277 277
       if ($p === false) {
278
-         $this->triggerError ("Invalid HTML comment in template at offset $p0.");
278
+         $this->triggerError("Invalid HTML comment in template at offset $p0.");
279 279
          return false; }
280 280
       $p += 3;
281
-      $cmdL = substr($this->template,$p0+4,$p-$p0-7);
282
-      if (!$this->processTemplateCommand($cmdL,$p0,$p,$resumeFromStart))
281
+      $cmdL = substr($this->template, $p0 + 4, $p - $p0 - 7);
282
+      if (!$this->processTemplateCommand($cmdL, $p0, $p, $resumeFromStart))
283 283
          return false;
284 284
       if ($resumeFromStart) $p = $p0; }
285 285
    return true; }
@@ -288,29 +288,29 @@  discard block
 block discarded – undo
288 288
 * @return boolean  true on success, false on error.
289 289
 * @access private
290 290
 */
291
-function processTemplateCommand ($cmdL, $cmdTPosBegin, $cmdTPosEnd, &$resumeFromStart) {
291
+function processTemplateCommand($cmdL, $cmdTPosBegin, $cmdTPosEnd, &$resumeFromStart) {
292 292
    $resumeFromStart = false;
293 293
    $p = 0;
294 294
    $cmd = '';
295
-   if (!$this->parseWord($cmdL,$p,$cmd)) return true;
296
-   $parms = substr($cmdL,$p);
295
+   if (!$this->parseWord($cmdL, $p, $cmd)) return true;
296
+   $parms = substr($cmdL, $p);
297 297
    switch (strtoupper($cmd)) {
298 298
       case '$BEGINBLOCK':
299
-         if (!$this->processBeginBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd))
299
+         if (!$this->processBeginBlockCmd($parms, $cmdTPosBegin, $cmdTPosEnd))
300 300
             return false;
301 301
          break;
302 302
       case '$ENDBLOCK':
303
-         if (!$this->processEndBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd))
303
+         if (!$this->processEndBlockCmd($parms, $cmdTPosBegin, $cmdTPosEnd))
304 304
             return false;
305 305
          break;
306 306
       case '$INCLUDE':
307
-         if (!$this->processincludeCmd($parms,$cmdTPosBegin,$cmdTPosEnd))
307
+         if (!$this->processincludeCmd($parms, $cmdTPosBegin, $cmdTPosEnd))
308 308
             return false;
309 309
          $resumeFromStart = true;
310 310
          break;
311 311
       default:
312 312
          if ($cmd{0} == '$' && !(strlen($cmd) >= 2 && $cmd{1} == '{')) {
313
-            $this->triggerError ("Unknown command \"$cmd\" in template at offset $cmdTPosBegin.");
313
+            $this->triggerError("Unknown command \"$cmd\" in template at offset $cmdTPosBegin.");
314 314
             return false; }}
315 315
     return true; }
316 316
 
@@ -319,24 +319,24 @@  discard block
 block discarded – undo
319 319
 * @return boolean  true on success, false on error.
320 320
 * @access private
321 321
 */
322
-function processBeginBlockCmd ($parms, $cmdTPosBegin, $cmdTPosEnd) {
322
+function processBeginBlockCmd($parms, $cmdTPosBegin, $cmdTPosEnd) {
323 323
    $p = 0;
324
-   if (!$this->parseWord($parms,$p,$blockName)) {
325
-      $this->triggerError ("Missing block name in \$BeginBlock command in template at offset $cmdTPosBegin.");
324
+   if (!$this->parseWord($parms, $p, $blockName)) {
325
+      $this->triggerError("Missing block name in \$BeginBlock command in template at offset $cmdTPosBegin.");
326 326
       return false; }
327
-   if (trim(substr($parms,$p)) != '') {
328
-      $this->triggerError ("Extra parameter in \$BeginBlock command in template at offset $cmdTPosBegin.");
327
+   if (trim(substr($parms, $p)) != '') {
328
+      $this->triggerError("Extra parameter in \$BeginBlock command in template at offset $cmdTPosBegin.");
329 329
       return false; }
330
-   $this->registerBlock ($blockName, $blockNo);
331
-   $btr =& $this->blockTab[$blockNo];
330
+   $this->registerBlock($blockName, $blockNo);
331
+   $btr = & $this->blockTab[$blockNo];
332 332
    $btr['tPosBegin'] = $cmdTPosBegin;
333 333
    $btr['tPosContentsBegin'] = $cmdTPosEnd;
334 334
    $btr['nestingLevel'] = $this->currentNestingLevel;
335
-   $btr['parentBlockNo'] = $this->openBlocksTab[$this->currentNestingLevel-1];
335
+   $btr['parentBlockNo'] = $this->openBlocksTab[$this->currentNestingLevel - 1];
336 336
    $this->openBlocksTab[$this->currentNestingLevel] = $blockNo;
337 337
    $this->currentNestingLevel += 1;
338 338
    if ($this->currentNestingLevel > $this->maxNestingLevel) {
339
-      $this->triggerError ("Block nesting overflow in template at offset $cmdTPosBegin.");
339
+      $this->triggerError("Block nesting overflow in template at offset $cmdTPosBegin.");
340 340
       return false; }
341 341
    return true; }
342 342
 
@@ -345,24 +345,24 @@  discard block
 block discarded – undo
345 345
 * @return boolean  true on success, false on error.
346 346
 * @access private
347 347
 */
348
-function processEndBlockCmd ($parms, $cmdTPosBegin, $cmdTPosEnd) {
348
+function processEndBlockCmd($parms, $cmdTPosBegin, $cmdTPosEnd) {
349 349
    $p = 0;
350
-   if (!$this->parseWord($parms,$p,$blockName)) {
351
-      $this->triggerError ("Missing block name in \$EndBlock command in template at offset $cmdTPosBegin.");
350
+   if (!$this->parseWord($parms, $p, $blockName)) {
351
+      $this->triggerError("Missing block name in \$EndBlock command in template at offset $cmdTPosBegin.");
352 352
       return false; }
353
-   if (trim(substr($parms,$p)) != '') {
354
-      $this->triggerError ("Extra parameter in \$EndBlock command in template at offset $cmdTPosBegin.");
353
+   if (trim(substr($parms, $p)) != '') {
354
+      $this->triggerError("Extra parameter in \$EndBlock command in template at offset $cmdTPosBegin.");
355 355
       return false; }
356
-   if (!$this->lookupBlockName($blockName,$blockNo)) {
357
-      $this->triggerError ("Undefined block name \"$blockName\" in \$EndBlock command in template at offset $cmdTPosBegin.");
356
+   if (!$this->lookupBlockName($blockName, $blockNo)) {
357
+      $this->triggerError("Undefined block name \"$blockName\" in \$EndBlock command in template at offset $cmdTPosBegin.");
358 358
       return false; }
359 359
    $this->currentNestingLevel -= 1;
360
-   $btr =& $this->blockTab[$blockNo];
360
+   $btr = & $this->blockTab[$blockNo];
361 361
    if (!$btr['definitionIsOpen']) {
362
-      $this->triggerError ("Multiple \$EndBlock command for block \"$blockName\" in template at offset $cmdTPosBegin.");
362
+      $this->triggerError("Multiple \$EndBlock command for block \"$blockName\" in template at offset $cmdTPosBegin.");
363 363
       return false; }
364 364
    if ($btr['nestingLevel'] != $this->currentNestingLevel) {
365
-      $this->triggerError ("Block nesting level mismatch at \$EndBlock command for block \"$blockName\" in template at offset $cmdTPosBegin.");
365
+      $this->triggerError("Block nesting level mismatch at \$EndBlock command for block \"$blockName\" in template at offset $cmdTPosBegin.");
366 366
       return false; }
367 367
    $btr['tPosContentsEnd'] = $cmdTPosBegin;
368 368
    $btr['tPosEnd'] = $cmdTPosEnd;
@@ -374,10 +374,10 @@  discard block
 block discarded – undo
374 374
 */
375 375
 function registerBlock($blockName, &$blockNo) {
376 376
    $blockNo = $this->blockTabCnt++;
377
-   $btr =& $this->blockTab[$blockNo];
377
+   $btr = & $this->blockTab[$blockNo];
378 378
    $btr = array();
379 379
    $btr['blockName'] = $blockName;
380
-   if (!$this->lookupBlockName($blockName,$btr['nextWithSameName']))
380
+   if (!$this->lookupBlockName($blockName, $btr['nextWithSameName']))
381 381
       $btr['nextWithSameName'] = -1;
382 382
    $btr['definitionIsOpen'] = true;
383 383
    $btr['instances'] = 0;
@@ -394,13 +394,13 @@  discard block
 block discarded – undo
394 394
 * @access private
395 395
 */
396 396
 function checkBlockDefinitionsComplete() {
397
-   for ($blockNo=0; $blockNo < $this->blockTabCnt; $blockNo++) {
398
-      $btr =& $this->blockTab[$blockNo];
397
+   for ($blockNo = 0; $blockNo < $this->blockTabCnt; $blockNo++) {
398
+      $btr = & $this->blockTab[$blockNo];
399 399
       if ($btr['definitionIsOpen']) {
400
-         $this->triggerError ("Missing \$EndBlock command in template for block " . $btr['blockName'] . ".");
400
+         $this->triggerError("Missing \$EndBlock command in template for block ".$btr['blockName'].".");
401 401
          return false; }}
402 402
    if ($this->currentNestingLevel != 0) {
403
-      $this->triggerError ("Block nesting level error at end of template.");
403
+      $this->triggerError("Block nesting level error at end of template.");
404 404
       return false; }
405 405
    return true; }
406 406
 
@@ -409,29 +409,29 @@  discard block
 block discarded – undo
409 409
 * @return boolean  true on success, false on error.
410 410
 * @access private
411 411
 */
412
-function processIncludeCmd ($parms, $cmdTPosBegin, $cmdTPosEnd) {
412
+function processIncludeCmd($parms, $cmdTPosBegin, $cmdTPosEnd) {
413 413
    $p = 0;
414
-   if (!$this->parseWordOrQuotedString($parms,$p,$subtemplateName)) {
415
-      $this->triggerError ("Missing or invalid subtemplate name in \$Include command in template at offset $cmdTPosBegin.");
414
+   if (!$this->parseWordOrQuotedString($parms, $p, $subtemplateName)) {
415
+      $this->triggerError("Missing or invalid subtemplate name in \$Include command in template at offset $cmdTPosBegin.");
416 416
       return false; }
417
-   if (trim(substr($parms,$p)) != '') {
418
-      $this->triggerError ("Extra parameter in \$include command in template at offset $cmdTPosBegin.");
417
+   if (trim(substr($parms, $p)) != '') {
418
+      $this->triggerError("Extra parameter in \$include command in template at offset $cmdTPosBegin.");
419 419
       return false; }
420
-   return $this->insertSubtemplate($subtemplateName,$cmdTPosBegin,$cmdTPosEnd); }
420
+   return $this->insertSubtemplate($subtemplateName, $cmdTPosBegin, $cmdTPosEnd); }
421 421
 
422 422
 /**
423 423
 * Processes the $Include command.
424 424
 * @return boolean  true on success, false on error.
425 425
 * @access private
426 426
 */
427
-function insertSubtemplate ($subtemplateName, $tPos1, $tPos2) {
427
+function insertSubtemplate($subtemplateName, $tPos1, $tPos2) {
428 428
    if (strlen($this->template) > $this->maxInclTemplateSize) {
429
-      $this->triggerError ("Subtemplate include aborted because the internal template string is longer than $this->maxInclTemplateSize characters.");
429
+      $this->triggerError("Subtemplate include aborted because the internal template string is longer than $this->maxInclTemplateSize characters.");
430 430
       return false; }
431
-   if (!$this->loadSubtemplate($subtemplateName,$subtemplate)) return false;
431
+   if (!$this->loadSubtemplate($subtemplateName, $subtemplate)) return false;
432 432
    // (Copying the template to insert a subtemplate is a bit slow. In a future implementation of MiniTemplator,
433 433
    // a table could be used that contains references to the string fragments.)
434
-   $this->template = substr($this->template,0,$tPos1) . $subtemplate . substr($this->template,$tPos2);
434
+   $this->template = substr($this->template, 0, $tPos1).$subtemplate.substr($this->template, $tPos2);
435 435
    return true; }
436 436
 
437 437
 /**
@@ -447,24 +447,24 @@  discard block
 block discarded – undo
447 447
       $p0 = $p;
448 448
       $p = strpos($this->template, '}', $p);
449 449
       if ($p === false) {
450
-         $this->triggerError ("Invalid variable reference in template at offset $p0.");
450
+         $this->triggerError("Invalid variable reference in template at offset $p0.");
451 451
          return false; }
452 452
       $p += 1;
453
-      $varName = trim(substr($this->template, $p0+2, $p-$p0-3));
453
+      $varName = trim(substr($this->template, $p0 + 2, $p - $p0 - 3));
454 454
       if (strlen($varName) == 0) {
455
-         $this->triggerError ("Empty variable name in template at offset $p0.");
455
+         $this->triggerError("Empty variable name in template at offset $p0.");
456 456
          return false; }
457
-      $this->registerVariableReference ($varName, $p0, $p); }
457
+      $this->registerVariableReference($varName, $p0, $p); }
458 458
    return true; }
459 459
 
460 460
 /**
461 461
 * @access private
462 462
 */
463
-function registerVariableReference ($varName, $tPosBegin, $tPosEnd) {
464
-   if (!$this->lookupVariableName($varName,$varNo))
465
-      $this->registerVariable($varName,$varNo);
463
+function registerVariableReference($varName, $tPosBegin, $tPosEnd) {
464
+   if (!$this->lookupVariableName($varName, $varNo))
465
+      $this->registerVariable($varName, $varNo);
466 466
    $varRefNo = $this->varRefTabCnt++;
467
-   $vrtr =& $this->varRefTab[$varRefNo];
467
+   $vrtr = & $this->varRefTab[$varRefNo];
468 468
    $vrtr = array();
469 469
    $vrtr['tPosBegin'] = $tPosBegin;
470 470
    $vrtr['tPosEnd'] = $tPosEnd;
@@ -473,9 +473,9 @@  discard block
 block discarded – undo
473 473
 /**
474 474
 * @access private
475 475
 */
476
-function registerVariable ($varName, &$varNo) {
476
+function registerVariable($varName, &$varNo) {
477 477
    $varNo = $this->varTabCnt++;
478
-   $vtr =& $this->varTab[$varNo];
478
+   $vtr = & $this->varTab[$varNo];
479 479
    $vtr = array();
480 480
    $vtr['varName'] = $varName;
481 481
    $vtr['varValue'] = '';
@@ -490,7 +490,7 @@  discard block
 block discarded – undo
490 490
    $activeBlockNo = 0;
491 491
    $nextBlockNo = 1;
492 492
    while ($varRefNo < $this->varRefTabCnt) {
493
-      $vrtr =& $this->varRefTab[$varRefNo];
493
+      $vrtr = & $this->varRefTab[$varRefNo];
494 494
       $varRefTPos = $vrtr['tPosBegin'];
495 495
       $varNo = $vrtr['varNo'];
496 496
       if ($varRefTPos >= $this->blockTab[$activeBlockNo]['tPosEnd']) {
@@ -501,7 +501,7 @@  discard block
 block discarded – undo
501 501
             $activeBlockNo = $nextBlockNo;
502 502
             $nextBlockNo += 1;
503 503
             continue; }}
504
-      $btr =& $this->blockTab[$activeBlockNo];
504
+      $btr = & $this->blockTab[$activeBlockNo];
505 505
       if ($varRefTPos < $btr['tPosBegin'])
506 506
          $this->programLogicError(1);
507 507
       $blockVarNo = $btr['blockVarCnt']++;
@@ -523,10 +523,10 @@  discard block
 block discarded – undo
523 523
 * @access public
524 524
 */
525 525
 function reset() {
526
-   for ($varNo=0; $varNo<$this->varTabCnt; $varNo++)
526
+   for ($varNo = 0; $varNo < $this->varTabCnt; $varNo++)
527 527
       $this->varTab[$varNo]['varValue'] = '';
528
-   for ($blockNo=0; $blockNo<$this->blockTabCnt; $blockNo++) {
529
-      $btr =& $this->blockTab[$blockNo];
528
+   for ($blockNo = 0; $blockNo < $this->blockTabCnt; $blockNo++) {
529
+      $btr = & $this->blockTab[$blockNo];
530 530
       $btr['instances'] = 0;
531 531
       $btr['firstBlockInstNo'] = -1;
532 532
       $btr['lastBlockInstNo'] = -1; }
@@ -548,11 +548,11 @@  discard block
 block discarded – undo
548 548
 *    $isOptional is false).
549 549
 * @access public
550 550
 */
551
-function setVariable ($variableName, $variableValue, $isOptional=false) {
552
-   if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }
553
-   if (!$this->lookupVariableName($variableName,$varNo)) {
551
+function setVariable($variableName, $variableValue, $isOptional = false) {
552
+   if (!$this->templateValid) {$this->triggerError("Template not valid."); return false; }
553
+   if (!$this->lookupVariableName($variableName, $varNo)) {
554 554
       if ($isOptional) return true;
555
-      $this->triggerError ("Variable \"$variableName\" not defined in template.");
555
+      $this->triggerError("Variable \"$variableName\" not defined in template.");
556 556
       return false; }
557 557
    $this->varTab[$varNo]['varValue'] = $variableValue;
558 558
    return true; }
@@ -575,8 +575,8 @@  discard block
 block discarded – undo
575 575
 *    $isOptional is false).
576 576
 * @access public
577 577
 */
578
-function setVariableEsc ($variableName, $variableValue, $isOptional=false) {
579
-   return $this->setVariable($variableName,htmlspecialchars($variableValue,ENT_QUOTES),$isOptional); }
578
+function setVariableEsc($variableName, $variableValue, $isOptional = false) {
579
+   return $this->setVariable($variableName, htmlspecialchars($variableValue, ENT_QUOTES), $isOptional); }
580 580
 
581 581
 /**
582 582
 * Checks whether a variable with the specified name exists within the template.
@@ -585,9 +585,9 @@  discard block
 block discarded – undo
585 585
 *    variable with the specified name exists in the template.
586 586
 * @access public
587 587
 */
588
-function variableExists ($variableName) {
589
-   if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }
590
-   return $this->lookupVariableName($variableName,$varNo); }
588
+function variableExists($variableName) {
589
+   if (!$this->templateValid) {$this->triggerError("Template not valid."); return false; }
590
+   return $this->lookupVariableName($variableName, $varNo); }
591 591
 
592 592
 /**
593 593
 * Adds an instance of a template block.
@@ -603,9 +603,9 @@  discard block
 block discarded – undo
603 603
 * @access public
604 604
 */
605 605
 function addBlock($blockName) {
606
-   if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }
607
-   if (!$this->lookupBlockName($blockName,$blockNo)) {
608
-      $this->triggerError ("Block \"$blockName\" not defined in template.");
606
+   if (!$this->templateValid) {$this->triggerError("Template not valid."); return false; }
607
+   if (!$this->lookupBlockName($blockName, $blockNo)) {
608
+      $this->triggerError("Block \"$blockName\" not defined in template.");
609 609
       return false; }
610 610
    while ($blockNo != -1) {
611 611
       $this->addBlockByNo($blockNo);
@@ -615,10 +615,10 @@  discard block
 block discarded – undo
615 615
 /**
616 616
 * @access private
617 617
 */
618
-function addBlockByNo ($blockNo) {
619
-   $btr =& $this->blockTab[$blockNo];
620
-   $this->registerBlockInstance ($blockInstNo);
621
-   $bitr =& $this->blockInstTab[$blockInstNo];
618
+function addBlockByNo($blockNo) {
619
+   $btr = & $this->blockTab[$blockNo];
620
+   $this->registerBlockInstance($blockInstNo);
621
+   $bitr = & $this->blockInstTab[$blockInstNo];
622 622
    if ($btr['firstBlockInstNo'] == -1)
623 623
       $btr['firstBlockInstNo'] = $blockInstNo;
624 624
    if ($btr['lastBlockInstNo'] != -1)
@@ -636,14 +636,14 @@  discard block
 block discarded – undo
636 636
    $bitr['nextBlockInstNo'] = -1;
637 637
    $bitr['blockVarTab'] = array();
638 638
    // copy instance variables for this block
639
-   for ($blockVarNo=0; $blockVarNo<$blockVarCnt; $blockVarNo++) {
639
+   for ($blockVarNo = 0; $blockVarNo < $blockVarCnt; $blockVarNo++) {
640 640
       $varNo = $btr['blockVarNoToVarNoMap'][$blockVarNo];
641 641
       $bitr['blockVarTab'][$blockVarNo] = $this->varTab[$varNo]['varValue']; }}
642 642
 
643 643
 /**
644 644
 * @access private
645 645
 */
646
-function registerBlockInstance (&$blockInstNo) {
646
+function registerBlockInstance(&$blockInstNo) {
647 647
    $blockInstNo = $this->blockInstTabCnt++; }
648 648
 
649 649
 /**
@@ -653,9 +653,9 @@  discard block
 block discarded – undo
653 653
 *    block with the specified name exists in the template.
654 654
 * @access public
655 655
 */
656
-function blockExists ($blockName) {
657
-   if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }
658
-   return $this->lookupBlockName($blockName,$blockNo); }
656
+function blockExists($blockName) {
657
+   if (!$this->templateValid) {$this->triggerError("Template not valid."); return false; }
658
+   return $this->lookupBlockName($blockName, $blockNo); }
659 659
 
660 660
 //--- output generation ---------------------------------------------------------------------------------------------
661 661
 
@@ -664,7 +664,7 @@  discard block
 block discarded – undo
664 664
 * @return boolean  true on success, false on error.
665 665
 * @access public
666 666
 */
667
-function generateOutput () {
667
+function generateOutput() {
668 668
    $this->outputMode = 0;
669 669
    if (!$this->generateOutputPage()) return false;
670 670
    return true; }
@@ -675,13 +675,13 @@  discard block
 block discarded – undo
675 675
 * @return boolean  true on success, false on error.
676 676
 * @access public
677 677
 */
678
-function generateOutputToFile ($fileName) {
679
-   $fh = fopen($fileName,"wb");
678
+function generateOutputToFile($fileName) {
679
+   $fh = fopen($fileName, "wb");
680 680
    if ($fh === false) return false;
681 681
    $this->outputMode = 1;
682 682
    $this->outputFileHandle = $fh;
683 683
    $ok = $this->generateOutputPage();
684
-   fclose ($fh);
684
+   fclose($fh);
685 685
    return $ok; }
686 686
 
687 687
 /**
@@ -691,7 +691,7 @@  discard block
 block discarded – undo
691 691
 * @return boolean  true on success, false on error.
692 692
 * @access public
693 693
 */
694
-function generateOutputToString (&$outputString) {
694
+function generateOutputToString(&$outputString) {
695 695
    $outputString = "Error";
696 696
    $this->outputMode = 2;
697 697
    $this->outputString = "";
@@ -704,14 +704,14 @@  discard block
 block discarded – undo
704 704
 * @return boolean  true on success, false on error.
705 705
 */
706 706
 function generateOutputPage() {
707
-   if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }
707
+   if (!$this->templateValid) {$this->triggerError("Template not valid."); return false; }
708 708
    if ($this->blockTab[0]['instances'] == 0)
709
-      $this->addBlockByNo (0);        // add main block
710
-   for ($blockNo=0; $blockNo < $this->blockTabCnt; $blockNo++) {
711
-       $btr =& $this->blockTab[$blockNo];
709
+      $this->addBlockByNo(0); // add main block
710
+   for ($blockNo = 0; $blockNo < $this->blockTabCnt; $blockNo++) {
711
+       $btr = & $this->blockTab[$blockNo];
712 712
        $btr['currBlockInstNo'] = $btr['firstBlockInstNo']; }
713 713
    $this->outputError = false;
714
-   $this->writeBlockInstances (0, -1);
714
+   $this->writeBlockInstances(0, -1);
715 715
    if ($this->outputError) return false;
716 716
    return true; }
717 717
 
@@ -721,33 +721,33 @@  discard block
 block discarded – undo
721 721
 * Called recursively.
722 722
 * @access private
723 723
 */
724
-function writeBlockInstances ($blockNo, $parentInstLevel) {
725
-   $btr =& $this->blockTab[$blockNo];
724
+function writeBlockInstances($blockNo, $parentInstLevel) {
725
+   $btr = & $this->blockTab[$blockNo];
726 726
    while (!$this->outputError) {
727 727
       $blockInstNo = $btr['currBlockInstNo'];
728 728
       if ($blockInstNo == -1) break;
729
-      $bitr =& $this->blockInstTab[$blockInstNo];
729
+      $bitr = & $this->blockInstTab[$blockInstNo];
730 730
       if ($bitr['parentInstLevel'] < $parentInstLevel)
731
-         $this->programLogicError (2);
731
+         $this->programLogicError(2);
732 732
       if ($bitr['parentInstLevel'] > $parentInstLevel) break;
733
-      $this->writeBlockInstance ($blockInstNo);
733
+      $this->writeBlockInstance($blockInstNo);
734 734
       $btr['currBlockInstNo'] = $bitr['nextBlockInstNo']; }}
735 735
 
736 736
 /**
737 737
 * @access private
738 738
 */
739 739
 function writeBlockInstance($blockInstNo) {
740
-   $bitr =& $this->blockInstTab[$blockInstNo];
740
+   $bitr = & $this->blockInstTab[$blockInstNo];
741 741
    $blockNo = $bitr['blockNo'];
742
-   $btr =& $this->blockTab[$blockNo];
742
+   $btr = & $this->blockTab[$blockNo];
743 743
    $tPos = $btr['tPosContentsBegin'];
744 744
    $subBlockNo = $blockNo + 1;
745 745
    $varRefNo = $btr['firstVarRefNo'];
746 746
    while (!$this->outputError) {
747 747
       $tPos2 = $btr['tPosContentsEnd'];
748
-      $kind = 0;                                // assume end-of-block
748
+      $kind = 0; // assume end-of-block
749 749
       if ($varRefNo != -1 && $varRefNo < $this->varRefTabCnt) {  // check for variable reference
750
-         $vrtr =& $this->varRefTab[$varRefNo];
750
+         $vrtr = & $this->varRefTab[$varRefNo];
751 751
          if ($vrtr['tPosBegin'] < $tPos) {
752 752
             $varRefNo += 1;
753 753
             continue; }
@@ -755,7 +755,7 @@  discard block
 block discarded – undo
755 755
             $tPos2 = $vrtr['tPosBegin'];
756 756
             $kind = 1; }}
757 757
       if ($subBlockNo < $this->blockTabCnt) {   // check for subblock
758
-         $subBtr =& $this->blockTab[$subBlockNo];
758
+         $subBtr = & $this->blockTab[$subBlockNo];
759 759
          if ($subBtr['tPosBegin'] < $tPos) {
760 760
             $subBlockNo += 1;
761 761
             continue; }
@@ -763,24 +763,24 @@  discard block
 block discarded – undo
763 763
             $tPos2 = $subBtr['tPosBegin'];
764 764
             $kind = 2; }}
765 765
       if ($tPos2 > $tPos)
766
-         $this->writeString (substr($this->template,$tPos,$tPos2-$tPos));
766
+         $this->writeString(substr($this->template, $tPos, $tPos2 - $tPos));
767 767
       switch ($kind) {
768 768
          case 0:         // end of block
769 769
             return;
770 770
          case 1:         // variable
771
-            $vrtr =& $this->varRefTab[$varRefNo];
771
+            $vrtr = & $this->varRefTab[$varRefNo];
772 772
             if ($vrtr['blockNo'] != $blockNo)
773
-               $this->programLogicError (4);
773
+               $this->programLogicError(4);
774 774
             $variableValue = $bitr['blockVarTab'][$vrtr['blockVarNo']];
775
-            $this->writeString ($variableValue);
775
+            $this->writeString($variableValue);
776 776
             $tPos = $vrtr['tPosEnd'];
777 777
             $varRefNo += 1;
778 778
             break;
779 779
          case 2:         // sub block
780
-            $subBtr =& $this->blockTab[$subBlockNo];
780
+            $subBtr = & $this->blockTab[$subBlockNo];
781 781
             if ($subBtr['parentBlockNo'] != $blockNo)
782
-               $this->programLogicError (3);
783
-            $this->writeBlockInstances ($subBlockNo, $bitr['instanceLevel']);  // recursive call
782
+               $this->programLogicError(3);
783
+            $this->writeBlockInstances($subBlockNo, $bitr['instanceLevel']); // recursive call
784 784
             $tPos = $subBtr['tPosEnd'];
785 785
             $subBlockNo += 1;
786 786
             break; }}}
@@ -788,7 +788,7 @@  discard block
 block discarded – undo
788 788
 /**
789 789
 * @access private
790 790
 */
791
-function writeString ($s) {
791
+function writeString($s) {
792 792
    if ($this->outputError) return;
793 793
    switch ($this->outputMode) {
794 794
       case 0:            // output to PHP output stream
@@ -810,8 +810,8 @@  discard block
 block discarded – undo
810 810
 * @return boolean  true on success, false if the variable is not found.
811 811
 * @access private
812 812
 */
813
-function lookupVariableName ($varName, &$varNo) {
814
-   $x =& $this->varNameToNoMap[strtoupper($varName)];
813
+function lookupVariableName($varName, &$varNo) {
814
+   $x = & $this->varNameToNoMap[strtoupper($varName)];
815 815
    if (!isset($x)) return false;
816 816
    $varNo = $x;
817 817
    return true; }
@@ -823,8 +823,8 @@  discard block
 block discarded – undo
823 823
 * @return boolean  true on success, false when the block is not found.
824 824
 * @access private
825 825
 */
826
-function lookupBlockName ($blockName, &$blockNo) {
827
-   $x =& $this->blockNameToNoMap[strtoupper($blockName)];
826
+function lookupBlockName($blockName, &$blockNo) {
827
+   $x = & $this->blockNameToNoMap[strtoupper($blockName)];
828 828
    if (!isset($x)) return false;
829 829
    $blockNo = $x;
830 830
    return true; }
@@ -836,17 +836,17 @@  discard block
 block discarded – undo
836 836
 * @return boolean  true on success, false on error.
837 837
 * @access private
838 838
 */
839
-function readFileIntoString ($fileName, &$s) {
840
-   if (function_exists('version_compare') && version_compare(phpversion(),"4.3.0",">=")) {
839
+function readFileIntoString($fileName, &$s) {
840
+   if (function_exists('version_compare') && version_compare(phpversion(), "4.3.0", ">=")) {
841 841
       $s = file_get_contents($fileName);
842 842
       if ($s === false) return false;
843 843
       return true; }
844
-   $fh = fopen($fileName,"rb");
844
+   $fh = fopen($fileName, "rb");
845 845
    if ($fh === false) return false;
846 846
    $fileSize = filesize($fileName);
847
-   if ($fileSize === false) {fclose ($fh); return false; }
848
-   $s = fread($fh,$fileSize);
849
-   fclose ($fh);
847
+   if ($fileSize === false) {fclose($fh); return false; }
848
+   $s = fread($fh, $fileSize);
849
+   fclose($fh);
850 850
    if (strlen($s) != $fileSize) return false;
851 851
    return true; }
852 852
 
@@ -854,7 +854,7 @@  discard block
 block discarded – undo
854 854
 * @access private
855 855
 * @return boolean  true on success, false when the end of the string is reached.
856 856
 */
857
-function parseWord ($s, &$p, &$w) {
857
+function parseWord($s, &$p, &$w) {
858 858
    $sLen = strlen($s);
859 859
    while ($p < $sLen && ord($s{$p}) <= 32) $p++;
860 860
    if ($p >= $sLen) return false;
@@ -867,11 +867,11 @@  discard block
 block discarded – undo
867 867
 * @access private
868 868
 * @return boolean  true on success, false on error.
869 869
 */
870
-function parseQuotedString ($s, &$p, &$w) {
870
+function parseQuotedString($s, &$p, &$w) {
871 871
    $sLen = strlen($s);
872 872
    while ($p < $sLen && ord($s{$p}) <= 32) $p++;
873 873
    if ($p >= $sLen) return false;
874
-   if (substr($s,$p,1) != '"') return false;
874
+   if (substr($s, $p, 1) != '"') return false;
875 875
    $p++; $p0 = $p;
876 876
    while ($p < $sLen && $s{$p} != '"') $p++;
877 877
    if ($p >= $sLen) return false;
@@ -883,39 +883,39 @@  discard block
 block discarded – undo
883 883
 * @access private
884 884
 * @return boolean  true on success, false on error.
885 885
 */
886
-function parseWordOrQuotedString ($s, &$p, &$w) {
886
+function parseWordOrQuotedString($s, &$p, &$w) {
887 887
    $sLen = strlen($s);
888 888
    while ($p < $sLen && ord($s{$p}) <= 32) $p++;
889 889
    if ($p >= $sLen) return false;
890
-   if (substr($s,$p,1) == '"')
891
-      return $this->parseQuotedString($s,$p,$w);
890
+   if (substr($s, $p, 1) == '"')
891
+      return $this->parseQuotedString($s, $p, $w);
892 892
     else
893
-      return $this->parseWord($s,$p,$w); }
893
+      return $this->parseWord($s, $p, $w); }
894 894
 
895 895
 /**
896 896
 * Combine two file system paths.
897 897
 * @access private
898 898
 */
899
-function combineFileSystemPath ($path1, $path2) {
899
+function combineFileSystemPath($path1, $path2) {
900 900
    if ($path1 == '' || $path2 == '') return $path2;
901 901
    $s = $path1;
902
-   if (substr($s,-1) != '\\' && substr($s,-1) != '/') $s = $s . "/";
903
-   if (substr($path2,0,1) == '\\' || substr($path2,0,1) == '/')
904
-      $s = $s . substr($path2,1);
902
+   if (substr($s, -1) != '\\' && substr($s, -1) != '/') $s = $s."/";
903
+   if (substr($path2, 0, 1) == '\\' || substr($path2, 0, 1) == '/')
904
+      $s = $s.substr($path2, 1);
905 905
     else
906
-      $s = $s . $path2;
906
+      $s = $s.$path2;
907 907
    return $s; }
908 908
 
909 909
 /**
910 910
 * @access private
911 911
 */
912
-function triggerError ($msg) {
913
-   trigger_error ("MiniTemplator error: $msg", E_USER_ERROR); }
912
+function triggerError($msg) {
913
+   trigger_error("MiniTemplator error: $msg", E_USER_ERROR); }
914 914
 
915 915
 /**
916 916
 * @access private
917 917
 */
918
-function programLogicError ($errorId) {
918
+function programLogicError($errorId) {
919 919
    die ("MiniTemplator: Program logic error $errorId.\n"); }
920 920
 
921 921
 }
Please login to merge, or discard this patch.
Indentation   +383 added lines, -383 removed lines patch added patch discarded remove patch
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
 * @access public
162 162
 */
163 163
 function __construct() {
164
-   $this->templateValid = false; }
164
+    $this->templateValid = false; }
165 165
 
166 166
 //--- template string handling --------------------------------------------------------------------------------------
167 167
 
@@ -172,11 +172,11 @@  discard block
 block discarded – undo
172 172
 * @access public
173 173
 */
174 174
 function readTemplateFromFile ($fileName) {
175
-   if (!$this->readFileIntoString($fileName,$s)) {
176
-      $this->triggerError ("Error while reading template file " . $fileName . ".");
177
-      return false; }
178
-   if (!$this->setTemplateString($s)) return false;
179
-   return true; }
175
+    if (!$this->readFileIntoString($fileName,$s)) {
176
+        $this->triggerError ("Error while reading template file " . $fileName . ".");
177
+        return false; }
178
+    if (!$this->setTemplateString($s)) return false;
179
+    return true; }
180 180
 
181 181
 /**
182 182
 * Assigns a new template string.
@@ -185,12 +185,12 @@  discard block
 block discarded – undo
185 185
 * @access public
186 186
 */
187 187
 function setTemplateString ($templateString) {
188
-   $this->templateValid = false;
189
-   $this->template = $templateString;
190
-   if (!$this->parseTemplate()) return false;
191
-   $this->reset();
192
-   $this->templateValid = true;
193
-   return true; }
188
+    $this->templateValid = false;
189
+    $this->template = $templateString;
190
+    if (!$this->parseTemplate()) return false;
191
+    $this->reset();
192
+    $this->templateValid = true;
193
+    return true; }
194 194
 
195 195
 /**
196 196
 * Loads the template string for a subtemplate (used for the $Include command).
@@ -198,11 +198,11 @@  discard block
 block discarded – undo
198 198
 * @access private
199 199
 */
200 200
 function loadSubtemplate ($subtemplateName, &$s) {
201
-   $subtemplateFileName = $this->combineFileSystemPath($this->subtemplateBasePath,$subtemplateName);
202
-   if (!$this->readFileIntoString($subtemplateFileName,$s)) {
203
-      $this->triggerError ("Error while reading subtemplate file " . $subtemplateFileName . ".");
204
-      return false; }
205
-   return true; }
201
+    $subtemplateFileName = $this->combineFileSystemPath($this->subtemplateBasePath,$subtemplateName);
202
+    if (!$this->readFileIntoString($subtemplateFileName,$s)) {
203
+        $this->triggerError ("Error while reading subtemplate file " . $subtemplateFileName . ".");
204
+        return false; }
205
+    return true; }
206 206
 
207 207
 //--- template parsing ----------------------------------------------------------------------------------------------
208 208
 
@@ -212,28 +212,28 @@  discard block
 block discarded – undo
212 212
 * @access private
213 213
 */
214 214
 function parseTemplate() {
215
-   $this->initParsing();
216
-   $this->beginMainBlock();
217
-   if (!$this->parseTemplateCommands()) return false;
218
-   $this->endMainBlock();
219
-   if (!$this->checkBlockDefinitionsComplete()) return false;
220
-   if (!$this->parseTemplateVariables()) return false;
221
-   $this->associateVariablesWithBlocks();
222
-   return true; }
215
+    $this->initParsing();
216
+    $this->beginMainBlock();
217
+    if (!$this->parseTemplateCommands()) return false;
218
+    $this->endMainBlock();
219
+    if (!$this->checkBlockDefinitionsComplete()) return false;
220
+    if (!$this->parseTemplateVariables()) return false;
221
+    $this->associateVariablesWithBlocks();
222
+    return true; }
223 223
 
224 224
 /**
225 225
 * @access private
226 226
 */
227 227
 function initParsing() {
228
-   $this->varTab = array();
229
-   $this->varTabCnt = 0;
230
-   $this->varNameToNoMap = array();
231
-   $this->varRefTab = array();
232
-   $this->varRefTabCnt = 0;
233
-   $this->blockTab = array();
234
-   $this->blockTabCnt = 0;
235
-   $this->blockNameToNoMap = array();
236
-   $this->openBlocksTab = array(); }
228
+    $this->varTab = array();
229
+    $this->varTabCnt = 0;
230
+    $this->varNameToNoMap = array();
231
+    $this->varRefTab = array();
232
+    $this->varRefTabCnt = 0;
233
+    $this->blockTab = array();
234
+    $this->blockTabCnt = 0;
235
+    $this->blockNameToNoMap = array();
236
+    $this->openBlocksTab = array(); }
237 237
 
238 238
 /**
239 239
 * Registers the main block.
@@ -241,27 +241,27 @@  discard block
 block discarded – undo
241 241
 * @access private
242 242
 */
243 243
 function beginMainBlock() {
244
-   $blockNo = 0;
245
-   $this->registerBlock('@@InternalMainBlock@@', $blockNo);
246
-   $bte =& $this->blockTab[$blockNo];
247
-   $bte['tPosBegin'] = 0;
248
-   $bte['tPosContentsBegin'] = 0;
249
-   $bte['nestingLevel'] = 0;
250
-   $bte['parentBlockNo'] = -1;
251
-   $bte['definitionIsOpen'] = true;
252
-   $this->openBlocksTab[0] = $blockNo;
253
-   $this->currentNestingLevel = 1; }
244
+    $blockNo = 0;
245
+    $this->registerBlock('@@InternalMainBlock@@', $blockNo);
246
+    $bte =& $this->blockTab[$blockNo];
247
+    $bte['tPosBegin'] = 0;
248
+    $bte['tPosContentsBegin'] = 0;
249
+    $bte['nestingLevel'] = 0;
250
+    $bte['parentBlockNo'] = -1;
251
+    $bte['definitionIsOpen'] = true;
252
+    $this->openBlocksTab[0] = $blockNo;
253
+    $this->currentNestingLevel = 1; }
254 254
 
255 255
 /**
256 256
 * Completes the main block registration.
257 257
 * @access private
258 258
 */
259 259
 function endMainBlock() {
260
-   $bte =& $this->blockTab[0];
261
-   $bte['tPosContentsEnd'] = strlen($this->template);
262
-   $bte['tPosEnd'] = strlen($this->template);
263
-   $bte['definitionIsOpen'] = false;
264
-   $this->currentNestingLevel -= 1; }
260
+    $bte =& $this->blockTab[0];
261
+    $bte['tPosContentsEnd'] = strlen($this->template);
262
+    $bte['tPosEnd'] = strlen($this->template);
263
+    $bte['definitionIsOpen'] = false;
264
+    $this->currentNestingLevel -= 1; }
265 265
 
266 266
 /**
267 267
 * Parses commands within the template in the format "<!-- $command parameters -->".
@@ -269,46 +269,46 @@  discard block
 block discarded – undo
269 269
 * @access private
270 270
 */
271 271
 function parseTemplateCommands() {
272
-   $p = 0;
273
-   while (true) {
274
-      $p0 = strpos($this->template,'<!--',$p);
275
-      if ($p0 === false) break;
276
-      $p = strpos($this->template,'-->',$p0);
277
-      if ($p === false) {
278
-         $this->triggerError ("Invalid HTML comment in template at offset $p0.");
279
-         return false; }
280
-      $p += 3;
281
-      $cmdL = substr($this->template,$p0+4,$p-$p0-7);
282
-      if (!$this->processTemplateCommand($cmdL,$p0,$p,$resumeFromStart))
283
-         return false;
284
-      if ($resumeFromStart) $p = $p0; }
285
-   return true; }
272
+    $p = 0;
273
+    while (true) {
274
+        $p0 = strpos($this->template,'<!--',$p);
275
+        if ($p0 === false) break;
276
+        $p = strpos($this->template,'-->',$p0);
277
+        if ($p === false) {
278
+            $this->triggerError ("Invalid HTML comment in template at offset $p0.");
279
+            return false; }
280
+        $p += 3;
281
+        $cmdL = substr($this->template,$p0+4,$p-$p0-7);
282
+        if (!$this->processTemplateCommand($cmdL,$p0,$p,$resumeFromStart))
283
+            return false;
284
+        if ($resumeFromStart) $p = $p0; }
285
+    return true; }
286 286
 
287 287
 /**
288 288
 * @return boolean  true on success, false on error.
289 289
 * @access private
290 290
 */
291 291
 function processTemplateCommand ($cmdL, $cmdTPosBegin, $cmdTPosEnd, &$resumeFromStart) {
292
-   $resumeFromStart = false;
293
-   $p = 0;
294
-   $cmd = '';
295
-   if (!$this->parseWord($cmdL,$p,$cmd)) return true;
296
-   $parms = substr($cmdL,$p);
297
-   switch (strtoupper($cmd)) {
298
-      case '$BEGINBLOCK':
292
+    $resumeFromStart = false;
293
+    $p = 0;
294
+    $cmd = '';
295
+    if (!$this->parseWord($cmdL,$p,$cmd)) return true;
296
+    $parms = substr($cmdL,$p);
297
+    switch (strtoupper($cmd)) {
298
+        case '$BEGINBLOCK':
299 299
          if (!$this->processBeginBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd))
300 300
             return false;
301
-         break;
302
-      case '$ENDBLOCK':
301
+            break;
302
+        case '$ENDBLOCK':
303 303
          if (!$this->processEndBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd))
304 304
             return false;
305
-         break;
306
-      case '$INCLUDE':
305
+            break;
306
+        case '$INCLUDE':
307 307
          if (!$this->processincludeCmd($parms,$cmdTPosBegin,$cmdTPosEnd))
308 308
             return false;
309
-         $resumeFromStart = true;
310
-         break;
311
-      default:
309
+            $resumeFromStart = true;
310
+            break;
311
+        default:
312 312
          if ($cmd{0} == '$' && !(strlen($cmd) >= 2 && $cmd{1} == '{')) {
313 313
             $this->triggerError ("Unknown command \"$cmd\" in template at offset $cmdTPosBegin.");
314 314
             return false; }}
@@ -320,25 +320,25 @@  discard block
 block discarded – undo
320 320
 * @access private
321 321
 */
322 322
 function processBeginBlockCmd ($parms, $cmdTPosBegin, $cmdTPosEnd) {
323
-   $p = 0;
324
-   if (!$this->parseWord($parms,$p,$blockName)) {
325
-      $this->triggerError ("Missing block name in \$BeginBlock command in template at offset $cmdTPosBegin.");
326
-      return false; }
327
-   if (trim(substr($parms,$p)) != '') {
328
-      $this->triggerError ("Extra parameter in \$BeginBlock command in template at offset $cmdTPosBegin.");
329
-      return false; }
330
-   $this->registerBlock ($blockName, $blockNo);
331
-   $btr =& $this->blockTab[$blockNo];
332
-   $btr['tPosBegin'] = $cmdTPosBegin;
333
-   $btr['tPosContentsBegin'] = $cmdTPosEnd;
334
-   $btr['nestingLevel'] = $this->currentNestingLevel;
335
-   $btr['parentBlockNo'] = $this->openBlocksTab[$this->currentNestingLevel-1];
336
-   $this->openBlocksTab[$this->currentNestingLevel] = $blockNo;
337
-   $this->currentNestingLevel += 1;
338
-   if ($this->currentNestingLevel > $this->maxNestingLevel) {
339
-      $this->triggerError ("Block nesting overflow in template at offset $cmdTPosBegin.");
340
-      return false; }
341
-   return true; }
323
+    $p = 0;
324
+    if (!$this->parseWord($parms,$p,$blockName)) {
325
+        $this->triggerError ("Missing block name in \$BeginBlock command in template at offset $cmdTPosBegin.");
326
+        return false; }
327
+    if (trim(substr($parms,$p)) != '') {
328
+        $this->triggerError ("Extra parameter in \$BeginBlock command in template at offset $cmdTPosBegin.");
329
+        return false; }
330
+    $this->registerBlock ($blockName, $blockNo);
331
+    $btr =& $this->blockTab[$blockNo];
332
+    $btr['tPosBegin'] = $cmdTPosBegin;
333
+    $btr['tPosContentsBegin'] = $cmdTPosEnd;
334
+    $btr['nestingLevel'] = $this->currentNestingLevel;
335
+    $btr['parentBlockNo'] = $this->openBlocksTab[$this->currentNestingLevel-1];
336
+    $this->openBlocksTab[$this->currentNestingLevel] = $blockNo;
337
+    $this->currentNestingLevel += 1;
338
+    if ($this->currentNestingLevel > $this->maxNestingLevel) {
339
+        $this->triggerError ("Block nesting overflow in template at offset $cmdTPosBegin.");
340
+        return false; }
341
+    return true; }
342 342
 
343 343
 /**
344 344
 * Processes the $EndBlock command.
@@ -346,47 +346,47 @@  discard block
 block discarded – undo
346 346
 * @access private
347 347
 */
348 348
 function processEndBlockCmd ($parms, $cmdTPosBegin, $cmdTPosEnd) {
349
-   $p = 0;
350
-   if (!$this->parseWord($parms,$p,$blockName)) {
351
-      $this->triggerError ("Missing block name in \$EndBlock command in template at offset $cmdTPosBegin.");
352
-      return false; }
353
-   if (trim(substr($parms,$p)) != '') {
354
-      $this->triggerError ("Extra parameter in \$EndBlock command in template at offset $cmdTPosBegin.");
355
-      return false; }
356
-   if (!$this->lookupBlockName($blockName,$blockNo)) {
357
-      $this->triggerError ("Undefined block name \"$blockName\" in \$EndBlock command in template at offset $cmdTPosBegin.");
358
-      return false; }
359
-   $this->currentNestingLevel -= 1;
360
-   $btr =& $this->blockTab[$blockNo];
361
-   if (!$btr['definitionIsOpen']) {
362
-      $this->triggerError ("Multiple \$EndBlock command for block \"$blockName\" in template at offset $cmdTPosBegin.");
363
-      return false; }
364
-   if ($btr['nestingLevel'] != $this->currentNestingLevel) {
365
-      $this->triggerError ("Block nesting level mismatch at \$EndBlock command for block \"$blockName\" in template at offset $cmdTPosBegin.");
366
-      return false; }
367
-   $btr['tPosContentsEnd'] = $cmdTPosBegin;
368
-   $btr['tPosEnd'] = $cmdTPosEnd;
369
-   $btr['definitionIsOpen'] = false;
370
-   return true; }
349
+    $p = 0;
350
+    if (!$this->parseWord($parms,$p,$blockName)) {
351
+        $this->triggerError ("Missing block name in \$EndBlock command in template at offset $cmdTPosBegin.");
352
+        return false; }
353
+    if (trim(substr($parms,$p)) != '') {
354
+        $this->triggerError ("Extra parameter in \$EndBlock command in template at offset $cmdTPosBegin.");
355
+        return false; }
356
+    if (!$this->lookupBlockName($blockName,$blockNo)) {
357
+        $this->triggerError ("Undefined block name \"$blockName\" in \$EndBlock command in template at offset $cmdTPosBegin.");
358
+        return false; }
359
+    $this->currentNestingLevel -= 1;
360
+    $btr =& $this->blockTab[$blockNo];
361
+    if (!$btr['definitionIsOpen']) {
362
+        $this->triggerError ("Multiple \$EndBlock command for block \"$blockName\" in template at offset $cmdTPosBegin.");
363
+        return false; }
364
+    if ($btr['nestingLevel'] != $this->currentNestingLevel) {
365
+        $this->triggerError ("Block nesting level mismatch at \$EndBlock command for block \"$blockName\" in template at offset $cmdTPosBegin.");
366
+        return false; }
367
+    $btr['tPosContentsEnd'] = $cmdTPosBegin;
368
+    $btr['tPosEnd'] = $cmdTPosEnd;
369
+    $btr['definitionIsOpen'] = false;
370
+    return true; }
371 371
 
372 372
 /**
373 373
 * @access private
374 374
 */
375 375
 function registerBlock($blockName, &$blockNo) {
376
-   $blockNo = $this->blockTabCnt++;
377
-   $btr =& $this->blockTab[$blockNo];
378
-   $btr = array();
379
-   $btr['blockName'] = $blockName;
380
-   if (!$this->lookupBlockName($blockName,$btr['nextWithSameName']))
381
-      $btr['nextWithSameName'] = -1;
382
-   $btr['definitionIsOpen'] = true;
383
-   $btr['instances'] = 0;
384
-   $btr['firstBlockInstNo'] = -1;
385
-   $btr['lastBlockInstNo'] = -1;
386
-   $btr['blockVarCnt'] = 0;
387
-   $btr['firstVarRefNo'] = -1;
388
-   $btr['blockVarNoToVarNoMap'] = array();
389
-   $this->blockNameToNoMap[strtoupper($blockName)] = $blockNo; }
376
+    $blockNo = $this->blockTabCnt++;
377
+    $btr =& $this->blockTab[$blockNo];
378
+    $btr = array();
379
+    $btr['blockName'] = $blockName;
380
+    if (!$this->lookupBlockName($blockName,$btr['nextWithSameName']))
381
+        $btr['nextWithSameName'] = -1;
382
+    $btr['definitionIsOpen'] = true;
383
+    $btr['instances'] = 0;
384
+    $btr['firstBlockInstNo'] = -1;
385
+    $btr['lastBlockInstNo'] = -1;
386
+    $btr['blockVarCnt'] = 0;
387
+    $btr['firstVarRefNo'] = -1;
388
+    $btr['blockVarNoToVarNoMap'] = array();
389
+    $this->blockNameToNoMap[strtoupper($blockName)] = $blockNo; }
390 390
 
391 391
 /**
392 392
 * Checks that all block definitions are closed.
@@ -394,15 +394,15 @@  discard block
 block discarded – undo
394 394
 * @access private
395 395
 */
396 396
 function checkBlockDefinitionsComplete() {
397
-   for ($blockNo=0; $blockNo < $this->blockTabCnt; $blockNo++) {
398
-      $btr =& $this->blockTab[$blockNo];
399
-      if ($btr['definitionIsOpen']) {
400
-         $this->triggerError ("Missing \$EndBlock command in template for block " . $btr['blockName'] . ".");
401
-         return false; }}
402
-   if ($this->currentNestingLevel != 0) {
403
-      $this->triggerError ("Block nesting level error at end of template.");
404
-      return false; }
405
-   return true; }
397
+    for ($blockNo=0; $blockNo < $this->blockTabCnt; $blockNo++) {
398
+        $btr =& $this->blockTab[$blockNo];
399
+        if ($btr['definitionIsOpen']) {
400
+            $this->triggerError ("Missing \$EndBlock command in template for block " . $btr['blockName'] . ".");
401
+            return false; }}
402
+    if ($this->currentNestingLevel != 0) {
403
+        $this->triggerError ("Block nesting level error at end of template.");
404
+        return false; }
405
+    return true; }
406 406
 
407 407
 /**
408 408
 * Processes the $Include command.
@@ -410,14 +410,14 @@  discard block
 block discarded – undo
410 410
 * @access private
411 411
 */
412 412
 function processIncludeCmd ($parms, $cmdTPosBegin, $cmdTPosEnd) {
413
-   $p = 0;
414
-   if (!$this->parseWordOrQuotedString($parms,$p,$subtemplateName)) {
415
-      $this->triggerError ("Missing or invalid subtemplate name in \$Include command in template at offset $cmdTPosBegin.");
416
-      return false; }
417
-   if (trim(substr($parms,$p)) != '') {
418
-      $this->triggerError ("Extra parameter in \$include command in template at offset $cmdTPosBegin.");
419
-      return false; }
420
-   return $this->insertSubtemplate($subtemplateName,$cmdTPosBegin,$cmdTPosEnd); }
413
+    $p = 0;
414
+    if (!$this->parseWordOrQuotedString($parms,$p,$subtemplateName)) {
415
+        $this->triggerError ("Missing or invalid subtemplate name in \$Include command in template at offset $cmdTPosBegin.");
416
+        return false; }
417
+    if (trim(substr($parms,$p)) != '') {
418
+        $this->triggerError ("Extra parameter in \$include command in template at offset $cmdTPosBegin.");
419
+        return false; }
420
+    return $this->insertSubtemplate($subtemplateName,$cmdTPosBegin,$cmdTPosEnd); }
421 421
 
422 422
 /**
423 423
 * Processes the $Include command.
@@ -425,14 +425,14 @@  discard block
 block discarded – undo
425 425
 * @access private
426 426
 */
427 427
 function insertSubtemplate ($subtemplateName, $tPos1, $tPos2) {
428
-   if (strlen($this->template) > $this->maxInclTemplateSize) {
429
-      $this->triggerError ("Subtemplate include aborted because the internal template string is longer than $this->maxInclTemplateSize characters.");
430
-      return false; }
431
-   if (!$this->loadSubtemplate($subtemplateName,$subtemplate)) return false;
432
-   // (Copying the template to insert a subtemplate is a bit slow. In a future implementation of MiniTemplator,
433
-   // a table could be used that contains references to the string fragments.)
434
-   $this->template = substr($this->template,0,$tPos1) . $subtemplate . substr($this->template,$tPos2);
435
-   return true; }
428
+    if (strlen($this->template) > $this->maxInclTemplateSize) {
429
+        $this->triggerError ("Subtemplate include aborted because the internal template string is longer than $this->maxInclTemplateSize characters.");
430
+        return false; }
431
+    if (!$this->loadSubtemplate($subtemplateName,$subtemplate)) return false;
432
+    // (Copying the template to insert a subtemplate is a bit slow. In a future implementation of MiniTemplator,
433
+    // a table could be used that contains references to the string fragments.)
434
+    $this->template = substr($this->template,0,$tPos1) . $subtemplate . substr($this->template,$tPos2);
435
+    return true; }
436 436
 
437 437
 /**
438 438
 * Parses variable references within the template in the format "${VarName}".
@@ -440,77 +440,77 @@  discard block
 block discarded – undo
440 440
 * @access private
441 441
 */
442 442
 function parseTemplateVariables() {
443
-   $p = 0;
444
-   while (true) {
445
-      $p = strpos($this->template, '${', $p);
446
-      if ($p === false) break;
447
-      $p0 = $p;
448
-      $p = strpos($this->template, '}', $p);
449
-      if ($p === false) {
450
-         $this->triggerError ("Invalid variable reference in template at offset $p0.");
451
-         return false; }
452
-      $p += 1;
453
-      $varName = trim(substr($this->template, $p0+2, $p-$p0-3));
454
-      if (strlen($varName) == 0) {
455
-         $this->triggerError ("Empty variable name in template at offset $p0.");
456
-         return false; }
457
-      $this->registerVariableReference ($varName, $p0, $p); }
458
-   return true; }
443
+    $p = 0;
444
+    while (true) {
445
+        $p = strpos($this->template, '${', $p);
446
+        if ($p === false) break;
447
+        $p0 = $p;
448
+        $p = strpos($this->template, '}', $p);
449
+        if ($p === false) {
450
+            $this->triggerError ("Invalid variable reference in template at offset $p0.");
451
+            return false; }
452
+        $p += 1;
453
+        $varName = trim(substr($this->template, $p0+2, $p-$p0-3));
454
+        if (strlen($varName) == 0) {
455
+            $this->triggerError ("Empty variable name in template at offset $p0.");
456
+            return false; }
457
+        $this->registerVariableReference ($varName, $p0, $p); }
458
+    return true; }
459 459
 
460 460
 /**
461 461
 * @access private
462 462
 */
463 463
 function registerVariableReference ($varName, $tPosBegin, $tPosEnd) {
464
-   if (!$this->lookupVariableName($varName,$varNo))
465
-      $this->registerVariable($varName,$varNo);
466
-   $varRefNo = $this->varRefTabCnt++;
467
-   $vrtr =& $this->varRefTab[$varRefNo];
468
-   $vrtr = array();
469
-   $vrtr['tPosBegin'] = $tPosBegin;
470
-   $vrtr['tPosEnd'] = $tPosEnd;
471
-   $vrtr['varNo'] = $varNo; }
464
+    if (!$this->lookupVariableName($varName,$varNo))
465
+        $this->registerVariable($varName,$varNo);
466
+    $varRefNo = $this->varRefTabCnt++;
467
+    $vrtr =& $this->varRefTab[$varRefNo];
468
+    $vrtr = array();
469
+    $vrtr['tPosBegin'] = $tPosBegin;
470
+    $vrtr['tPosEnd'] = $tPosEnd;
471
+    $vrtr['varNo'] = $varNo; }
472 472
 
473 473
 /**
474 474
 * @access private
475 475
 */
476 476
 function registerVariable ($varName, &$varNo) {
477
-   $varNo = $this->varTabCnt++;
478
-   $vtr =& $this->varTab[$varNo];
479
-   $vtr = array();
480
-   $vtr['varName'] = $varName;
481
-   $vtr['varValue'] = '';
482
-   $this->varNameToNoMap[strtoupper($varName)] = $varNo; }
477
+    $varNo = $this->varTabCnt++;
478
+    $vtr =& $this->varTab[$varNo];
479
+    $vtr = array();
480
+    $vtr['varName'] = $varName;
481
+    $vtr['varValue'] = '';
482
+    $this->varNameToNoMap[strtoupper($varName)] = $varNo; }
483 483
 
484 484
 /**
485 485
 * Associates variable references with blocks.
486 486
 * @access private
487 487
 */
488 488
 function associateVariablesWithBlocks() {
489
-   $varRefNo = 0;
490
-   $activeBlockNo = 0;
491
-   $nextBlockNo = 1;
492
-   while ($varRefNo < $this->varRefTabCnt) {
493
-      $vrtr =& $this->varRefTab[$varRefNo];
494
-      $varRefTPos = $vrtr['tPosBegin'];
495
-      $varNo = $vrtr['varNo'];
496
-      if ($varRefTPos >= $this->blockTab[$activeBlockNo]['tPosEnd']) {
497
-         $activeBlockNo = $this->blockTab[$activeBlockNo]['parentBlockNo'];
498
-         continue; }
499
-      if ($nextBlockNo < $this->blockTabCnt) {
500
-         if ($varRefTPos >= $this->blockTab[$nextBlockNo]['tPosBegin']) {
489
+    $varRefNo = 0;
490
+    $activeBlockNo = 0;
491
+    $nextBlockNo = 1;
492
+    while ($varRefNo < $this->varRefTabCnt) {
493
+        $vrtr =& $this->varRefTab[$varRefNo];
494
+        $varRefTPos = $vrtr['tPosBegin'];
495
+        $varNo = $vrtr['varNo'];
496
+        if ($varRefTPos >= $this->blockTab[$activeBlockNo]['tPosEnd']) {
497
+            $activeBlockNo = $this->blockTab[$activeBlockNo]['parentBlockNo'];
498
+            continue; }
499
+        if ($nextBlockNo < $this->blockTabCnt) {
500
+            if ($varRefTPos >= $this->blockTab[$nextBlockNo]['tPosBegin']) {
501 501
             $activeBlockNo = $nextBlockNo;
502 502
             $nextBlockNo += 1;
503 503
             continue; }}
504
-      $btr =& $this->blockTab[$activeBlockNo];
505
-      if ($varRefTPos < $btr['tPosBegin'])
506
-         $this->programLogicError(1);
507
-      $blockVarNo = $btr['blockVarCnt']++;
508
-      $btr['blockVarNoToVarNoMap'][$blockVarNo] = $varNo;
509
-      if ($btr['firstVarRefNo'] == -1)
510
-         $btr['firstVarRefNo'] = $varRefNo;
511
-      $vrtr['blockNo'] = $activeBlockNo;
512
-      $vrtr['blockVarNo'] = $blockVarNo;
513
-      $varRefNo += 1; }}
504
+        $btr =& $this->blockTab[$activeBlockNo];
505
+        if ($varRefTPos < $btr['tPosBegin'])
506
+            $this->programLogicError(1);
507
+        $blockVarNo = $btr['blockVarCnt']++;
508
+        $btr['blockVarNoToVarNoMap'][$blockVarNo] = $varNo;
509
+        if ($btr['firstVarRefNo'] == -1)
510
+            $btr['firstVarRefNo'] = $varRefNo;
511
+        $vrtr['blockNo'] = $activeBlockNo;
512
+        $vrtr['blockVarNo'] = $blockVarNo;
513
+        $varRefNo += 1; }}
514 514
 
515 515
 //--- build up (template variables and blocks) ----------------------------------------------------------------------
516 516
 
@@ -523,15 +523,15 @@  discard block
 block discarded – undo
523 523
 * @access public
524 524
 */
525 525
 function reset() {
526
-   for ($varNo=0; $varNo<$this->varTabCnt; $varNo++)
527
-      $this->varTab[$varNo]['varValue'] = '';
528
-   for ($blockNo=0; $blockNo<$this->blockTabCnt; $blockNo++) {
529
-      $btr =& $this->blockTab[$blockNo];
530
-      $btr['instances'] = 0;
531
-      $btr['firstBlockInstNo'] = -1;
532
-      $btr['lastBlockInstNo'] = -1; }
533
-   $this->blockInstTab = array();
534
-   $this->blockInstTabCnt = 0; }
526
+    for ($varNo=0; $varNo<$this->varTabCnt; $varNo++)
527
+        $this->varTab[$varNo]['varValue'] = '';
528
+    for ($blockNo=0; $blockNo<$this->blockTabCnt; $blockNo++) {
529
+        $btr =& $this->blockTab[$blockNo];
530
+        $btr['instances'] = 0;
531
+        $btr['firstBlockInstNo'] = -1;
532
+        $btr['lastBlockInstNo'] = -1; }
533
+    $this->blockInstTab = array();
534
+    $this->blockInstTabCnt = 0; }
535 535
 
536 536
 /**
537 537
 * Sets a template variable.
@@ -549,13 +549,13 @@  discard block
 block discarded – undo
549 549
 * @access public
550 550
 */
551 551
 function setVariable ($variableName, $variableValue, $isOptional=false) {
552
-   if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }
553
-   if (!$this->lookupVariableName($variableName,$varNo)) {
554
-      if ($isOptional) return true;
555
-      $this->triggerError ("Variable \"$variableName\" not defined in template.");
556
-      return false; }
557
-   $this->varTab[$varNo]['varValue'] = $variableValue;
558
-   return true; }
552
+    if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }
553
+    if (!$this->lookupVariableName($variableName,$varNo)) {
554
+        if ($isOptional) return true;
555
+        $this->triggerError ("Variable \"$variableName\" not defined in template.");
556
+        return false; }
557
+    $this->varTab[$varNo]['varValue'] = $variableValue;
558
+    return true; }
559 559
 
560 560
 /**
561 561
 * Sets a template variable to an escaped string.
@@ -576,7 +576,7 @@  discard block
 block discarded – undo
576 576
 * @access public
577 577
 */
578 578
 function setVariableEsc ($variableName, $variableValue, $isOptional=false) {
579
-   return $this->setVariable($variableName,htmlspecialchars($variableValue,ENT_QUOTES),$isOptional); }
579
+    return $this->setVariable($variableName,htmlspecialchars($variableValue,ENT_QUOTES),$isOptional); }
580 580
 
581 581
 /**
582 582
 * Checks whether a variable with the specified name exists within the template.
@@ -586,8 +586,8 @@  discard block
 block discarded – undo
586 586
 * @access public
587 587
 */
588 588
 function variableExists ($variableName) {
589
-   if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }
590
-   return $this->lookupVariableName($variableName,$varNo); }
589
+    if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }
590
+    return $this->lookupVariableName($variableName,$varNo); }
591 591
 
592 592
 /**
593 593
 * Adds an instance of a template block.
@@ -603,48 +603,48 @@  discard block
 block discarded – undo
603 603
 * @access public
604 604
 */
605 605
 function addBlock($blockName) {
606
-   if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }
607
-   if (!$this->lookupBlockName($blockName,$blockNo)) {
608
-      $this->triggerError ("Block \"$blockName\" not defined in template.");
609
-      return false; }
610
-   while ($blockNo != -1) {
611
-      $this->addBlockByNo($blockNo);
612
-      $blockNo = $this->blockTab[$blockNo]['nextWithSameName']; }
613
-   return true; }
606
+    if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }
607
+    if (!$this->lookupBlockName($blockName,$blockNo)) {
608
+        $this->triggerError ("Block \"$blockName\" not defined in template.");
609
+        return false; }
610
+    while ($blockNo != -1) {
611
+        $this->addBlockByNo($blockNo);
612
+        $blockNo = $this->blockTab[$blockNo]['nextWithSameName']; }
613
+    return true; }
614 614
 
615 615
 /**
616 616
 * @access private
617 617
 */
618 618
 function addBlockByNo ($blockNo) {
619
-   $btr =& $this->blockTab[$blockNo];
620
-   $this->registerBlockInstance ($blockInstNo);
621
-   $bitr =& $this->blockInstTab[$blockInstNo];
622
-   if ($btr['firstBlockInstNo'] == -1)
623
-      $btr['firstBlockInstNo'] = $blockInstNo;
624
-   if ($btr['lastBlockInstNo'] != -1)
625
-      $this->blockInstTab[$btr['lastBlockInstNo']]['nextBlockInstNo'] = $blockInstNo;
626
-         // set forward pointer of chain
627
-   $btr['lastBlockInstNo'] = $blockInstNo;
628
-   $parentBlockNo = $btr['parentBlockNo'];
629
-   $blockVarCnt = $btr['blockVarCnt'];
630
-   $bitr['blockNo'] = $blockNo;
631
-   $bitr['instanceLevel'] = $btr['instances']++;
632
-   if ($parentBlockNo == -1)
633
-      $bitr['parentInstLevel'] = -1;
619
+    $btr =& $this->blockTab[$blockNo];
620
+    $this->registerBlockInstance ($blockInstNo);
621
+    $bitr =& $this->blockInstTab[$blockInstNo];
622
+    if ($btr['firstBlockInstNo'] == -1)
623
+        $btr['firstBlockInstNo'] = $blockInstNo;
624
+    if ($btr['lastBlockInstNo'] != -1)
625
+        $this->blockInstTab[$btr['lastBlockInstNo']]['nextBlockInstNo'] = $blockInstNo;
626
+            // set forward pointer of chain
627
+    $btr['lastBlockInstNo'] = $blockInstNo;
628
+    $parentBlockNo = $btr['parentBlockNo'];
629
+    $blockVarCnt = $btr['blockVarCnt'];
630
+    $bitr['blockNo'] = $blockNo;
631
+    $bitr['instanceLevel'] = $btr['instances']++;
632
+    if ($parentBlockNo == -1)
633
+        $bitr['parentInstLevel'] = -1;
634 634
     else
635
-      $bitr['parentInstLevel'] = $this->blockTab[$parentBlockNo]['instances'];
636
-   $bitr['nextBlockInstNo'] = -1;
637
-   $bitr['blockVarTab'] = array();
638
-   // copy instance variables for this block
639
-   for ($blockVarNo=0; $blockVarNo<$blockVarCnt; $blockVarNo++) {
640
-      $varNo = $btr['blockVarNoToVarNoMap'][$blockVarNo];
641
-      $bitr['blockVarTab'][$blockVarNo] = $this->varTab[$varNo]['varValue']; }}
635
+        $bitr['parentInstLevel'] = $this->blockTab[$parentBlockNo]['instances'];
636
+    $bitr['nextBlockInstNo'] = -1;
637
+    $bitr['blockVarTab'] = array();
638
+    // copy instance variables for this block
639
+    for ($blockVarNo=0; $blockVarNo<$blockVarCnt; $blockVarNo++) {
640
+        $varNo = $btr['blockVarNoToVarNoMap'][$blockVarNo];
641
+        $bitr['blockVarTab'][$blockVarNo] = $this->varTab[$varNo]['varValue']; }}
642 642
 
643 643
 /**
644 644
 * @access private
645 645
 */
646 646
 function registerBlockInstance (&$blockInstNo) {
647
-   $blockInstNo = $this->blockInstTabCnt++; }
647
+    $blockInstNo = $this->blockInstTabCnt++; }
648 648
 
649 649
 /**
650 650
 * Checks whether a block with the specified name exists within the template.
@@ -654,8 +654,8 @@  discard block
 block discarded – undo
654 654
 * @access public
655 655
 */
656 656
 function blockExists ($blockName) {
657
-   if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }
658
-   return $this->lookupBlockName($blockName,$blockNo); }
657
+    if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }
658
+    return $this->lookupBlockName($blockName,$blockNo); }
659 659
 
660 660
 //--- output generation ---------------------------------------------------------------------------------------------
661 661
 
@@ -665,9 +665,9 @@  discard block
 block discarded – undo
665 665
 * @access public
666 666
 */
667 667
 function generateOutput () {
668
-   $this->outputMode = 0;
669
-   if (!$this->generateOutputPage()) return false;
670
-   return true; }
668
+    $this->outputMode = 0;
669
+    if (!$this->generateOutputPage()) return false;
670
+    return true; }
671 671
 
672 672
 /**
673 673
 * Generates the HTML page and writes it to a file.
@@ -676,13 +676,13 @@  discard block
 block discarded – undo
676 676
 * @access public
677 677
 */
678 678
 function generateOutputToFile ($fileName) {
679
-   $fh = fopen($fileName,"wb");
680
-   if ($fh === false) return false;
681
-   $this->outputMode = 1;
682
-   $this->outputFileHandle = $fh;
683
-   $ok = $this->generateOutputPage();
684
-   fclose ($fh);
685
-   return $ok; }
679
+    $fh = fopen($fileName,"wb");
680
+    if ($fh === false) return false;
681
+    $this->outputMode = 1;
682
+    $this->outputFileHandle = $fh;
683
+    $ok = $this->generateOutputPage();
684
+    fclose ($fh);
685
+    return $ok; }
686 686
 
687 687
 /**
688 688
 * Generates the HTML page and writes it to a string.
@@ -692,28 +692,28 @@  discard block
 block discarded – undo
692 692
 * @access public
693 693
 */
694 694
 function generateOutputToString (&$outputString) {
695
-   $outputString = "Error";
696
-   $this->outputMode = 2;
697
-   $this->outputString = "";
698
-   if (!$this->generateOutputPage()) return false;
699
-   $outputString = $this->outputString;
700
-   return true; }
695
+    $outputString = "Error";
696
+    $this->outputMode = 2;
697
+    $this->outputString = "";
698
+    if (!$this->generateOutputPage()) return false;
699
+    $outputString = $this->outputString;
700
+    return true; }
701 701
 
702 702
 /**
703 703
 * @access private
704 704
 * @return boolean  true on success, false on error.
705 705
 */
706 706
 function generateOutputPage() {
707
-   if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }
708
-   if ($this->blockTab[0]['instances'] == 0)
709
-      $this->addBlockByNo (0);        // add main block
710
-   for ($blockNo=0; $blockNo < $this->blockTabCnt; $blockNo++) {
711
-       $btr =& $this->blockTab[$blockNo];
712
-       $btr['currBlockInstNo'] = $btr['firstBlockInstNo']; }
713
-   $this->outputError = false;
714
-   $this->writeBlockInstances (0, -1);
715
-   if ($this->outputError) return false;
716
-   return true; }
707
+    if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }
708
+    if ($this->blockTab[0]['instances'] == 0)
709
+        $this->addBlockByNo (0);        // add main block
710
+    for ($blockNo=0; $blockNo < $this->blockTabCnt; $blockNo++) {
711
+        $btr =& $this->blockTab[$blockNo];
712
+        $btr['currBlockInstNo'] = $btr['firstBlockInstNo']; }
713
+    $this->outputError = false;
714
+    $this->writeBlockInstances (0, -1);
715
+    if ($this->outputError) return false;
716
+    return true; }
717 717
 
718 718
 /**
719 719
 * Writes all instances of a block that are contained within a specific
@@ -722,64 +722,64 @@  discard block
 block discarded – undo
722 722
 * @access private
723 723
 */
724 724
 function writeBlockInstances ($blockNo, $parentInstLevel) {
725
-   $btr =& $this->blockTab[$blockNo];
726
-   while (!$this->outputError) {
727
-      $blockInstNo = $btr['currBlockInstNo'];
728
-      if ($blockInstNo == -1) break;
729
-      $bitr =& $this->blockInstTab[$blockInstNo];
730
-      if ($bitr['parentInstLevel'] < $parentInstLevel)
731
-         $this->programLogicError (2);
732
-      if ($bitr['parentInstLevel'] > $parentInstLevel) break;
733
-      $this->writeBlockInstance ($blockInstNo);
734
-      $btr['currBlockInstNo'] = $bitr['nextBlockInstNo']; }}
725
+    $btr =& $this->blockTab[$blockNo];
726
+    while (!$this->outputError) {
727
+        $blockInstNo = $btr['currBlockInstNo'];
728
+        if ($blockInstNo == -1) break;
729
+        $bitr =& $this->blockInstTab[$blockInstNo];
730
+        if ($bitr['parentInstLevel'] < $parentInstLevel)
731
+            $this->programLogicError (2);
732
+        if ($bitr['parentInstLevel'] > $parentInstLevel) break;
733
+        $this->writeBlockInstance ($blockInstNo);
734
+        $btr['currBlockInstNo'] = $bitr['nextBlockInstNo']; }}
735 735
 
736 736
 /**
737 737
 * @access private
738 738
 */
739 739
 function writeBlockInstance($blockInstNo) {
740
-   $bitr =& $this->blockInstTab[$blockInstNo];
741
-   $blockNo = $bitr['blockNo'];
742
-   $btr =& $this->blockTab[$blockNo];
743
-   $tPos = $btr['tPosContentsBegin'];
744
-   $subBlockNo = $blockNo + 1;
745
-   $varRefNo = $btr['firstVarRefNo'];
746
-   while (!$this->outputError) {
747
-      $tPos2 = $btr['tPosContentsEnd'];
748
-      $kind = 0;                                // assume end-of-block
749
-      if ($varRefNo != -1 && $varRefNo < $this->varRefTabCnt) {  // check for variable reference
750
-         $vrtr =& $this->varRefTab[$varRefNo];
751
-         if ($vrtr['tPosBegin'] < $tPos) {
740
+    $bitr =& $this->blockInstTab[$blockInstNo];
741
+    $blockNo = $bitr['blockNo'];
742
+    $btr =& $this->blockTab[$blockNo];
743
+    $tPos = $btr['tPosContentsBegin'];
744
+    $subBlockNo = $blockNo + 1;
745
+    $varRefNo = $btr['firstVarRefNo'];
746
+    while (!$this->outputError) {
747
+        $tPos2 = $btr['tPosContentsEnd'];
748
+        $kind = 0;                                // assume end-of-block
749
+        if ($varRefNo != -1 && $varRefNo < $this->varRefTabCnt) {  // check for variable reference
750
+            $vrtr =& $this->varRefTab[$varRefNo];
751
+            if ($vrtr['tPosBegin'] < $tPos) {
752 752
             $varRefNo += 1;
753 753
             continue; }
754
-         if ($vrtr['tPosBegin'] < $tPos2) {
754
+            if ($vrtr['tPosBegin'] < $tPos2) {
755 755
             $tPos2 = $vrtr['tPosBegin'];
756 756
             $kind = 1; }}
757
-      if ($subBlockNo < $this->blockTabCnt) {   // check for subblock
758
-         $subBtr =& $this->blockTab[$subBlockNo];
759
-         if ($subBtr['tPosBegin'] < $tPos) {
757
+        if ($subBlockNo < $this->blockTabCnt) {   // check for subblock
758
+            $subBtr =& $this->blockTab[$subBlockNo];
759
+            if ($subBtr['tPosBegin'] < $tPos) {
760 760
             $subBlockNo += 1;
761 761
             continue; }
762
-         if ($subBtr['tPosBegin'] < $tPos2) {
762
+            if ($subBtr['tPosBegin'] < $tPos2) {
763 763
             $tPos2 = $subBtr['tPosBegin'];
764 764
             $kind = 2; }}
765
-      if ($tPos2 > $tPos)
766
-         $this->writeString (substr($this->template,$tPos,$tPos2-$tPos));
767
-      switch ($kind) {
768
-         case 0:         // end of block
765
+        if ($tPos2 > $tPos)
766
+            $this->writeString (substr($this->template,$tPos,$tPos2-$tPos));
767
+        switch ($kind) {
768
+            case 0:         // end of block
769 769
             return;
770
-         case 1:         // variable
770
+            case 1:         // variable
771 771
             $vrtr =& $this->varRefTab[$varRefNo];
772 772
             if ($vrtr['blockNo'] != $blockNo)
773
-               $this->programLogicError (4);
773
+                $this->programLogicError (4);
774 774
             $variableValue = $bitr['blockVarTab'][$vrtr['blockVarNo']];
775 775
             $this->writeString ($variableValue);
776 776
             $tPos = $vrtr['tPosEnd'];
777 777
             $varRefNo += 1;
778 778
             break;
779
-         case 2:         // sub block
779
+            case 2:         // sub block
780 780
             $subBtr =& $this->blockTab[$subBlockNo];
781 781
             if ($subBtr['parentBlockNo'] != $blockNo)
782
-               $this->programLogicError (3);
782
+                $this->programLogicError (3);
783 783
             $this->writeBlockInstances ($subBlockNo, $bitr['instanceLevel']);  // recursive call
784 784
             $tPos = $subBtr['tPosEnd'];
785 785
             $subBlockNo += 1;
@@ -789,19 +789,19 @@  discard block
 block discarded – undo
789 789
 * @access private
790 790
 */
791 791
 function writeString ($s) {
792
-   if ($this->outputError) return;
793
-   switch ($this->outputMode) {
794
-      case 0:            // output to PHP output stream
792
+    if ($this->outputError) return;
793
+    switch ($this->outputMode) {
794
+        case 0:            // output to PHP output stream
795 795
          if (!print($s))
796 796
             $this->outputError = true;
797
-         break;
798
-      case 1:            // output to file
797
+            break;
798
+        case 1:            // output to file
799 799
          $rc = fwrite($this->outputFileHandle, $s);
800
-         if ($rc === false) $this->outputError = true;
801
-         break;
802
-      case 2:            // output to string
800
+            if ($rc === false) $this->outputError = true;
801
+            break;
802
+        case 2:            // output to string
803 803
          $this->outputString .= $s;
804
-         break; }}
804
+            break; }}
805 805
 
806 806
 //--- name lookup routines ------------------------------------------------------------------------------------------
807 807
 
@@ -811,10 +811,10 @@  discard block
 block discarded – undo
811 811
 * @access private
812 812
 */
813 813
 function lookupVariableName ($varName, &$varNo) {
814
-   $x =& $this->varNameToNoMap[strtoupper($varName)];
815
-   if (!isset($x)) return false;
816
-   $varNo = $x;
817
-   return true; }
814
+    $x =& $this->varNameToNoMap[strtoupper($varName)];
815
+    if (!isset($x)) return false;
816
+    $varNo = $x;
817
+    return true; }
818 818
 
819 819
 /**
820 820
 * Maps block name to block number.
@@ -824,10 +824,10 @@  discard block
 block discarded – undo
824 824
 * @access private
825 825
 */
826 826
 function lookupBlockName ($blockName, &$blockNo) {
827
-   $x =& $this->blockNameToNoMap[strtoupper($blockName)];
828
-   if (!isset($x)) return false;
829
-   $blockNo = $x;
830
-   return true; }
827
+    $x =& $this->blockNameToNoMap[strtoupper($blockName)];
828
+    if (!isset($x)) return false;
829
+    $blockNo = $x;
830
+    return true; }
831 831
 
832 832
 //--- general utility routines -----------------------------------------------------------------------------------------
833 833
 
@@ -837,86 +837,86 @@  discard block
 block discarded – undo
837 837
 * @access private
838 838
 */
839 839
 function readFileIntoString ($fileName, &$s) {
840
-   if (function_exists('version_compare') && version_compare(phpversion(),"4.3.0",">=")) {
841
-      $s = file_get_contents($fileName);
842
-      if ($s === false) return false;
843
-      return true; }
844
-   $fh = fopen($fileName,"rb");
845
-   if ($fh === false) return false;
846
-   $fileSize = filesize($fileName);
847
-   if ($fileSize === false) {fclose ($fh); return false; }
848
-   $s = fread($fh,$fileSize);
849
-   fclose ($fh);
850
-   if (strlen($s) != $fileSize) return false;
851
-   return true; }
840
+    if (function_exists('version_compare') && version_compare(phpversion(),"4.3.0",">=")) {
841
+        $s = file_get_contents($fileName);
842
+        if ($s === false) return false;
843
+        return true; }
844
+    $fh = fopen($fileName,"rb");
845
+    if ($fh === false) return false;
846
+    $fileSize = filesize($fileName);
847
+    if ($fileSize === false) {fclose ($fh); return false; }
848
+    $s = fread($fh,$fileSize);
849
+    fclose ($fh);
850
+    if (strlen($s) != $fileSize) return false;
851
+    return true; }
852 852
 
853 853
 /**
854 854
 * @access private
855 855
 * @return boolean  true on success, false when the end of the string is reached.
856 856
 */
857 857
 function parseWord ($s, &$p, &$w) {
858
-   $sLen = strlen($s);
859
-   while ($p < $sLen && ord($s{$p}) <= 32) $p++;
860
-   if ($p >= $sLen) return false;
861
-   $p0 = $p;
862
-   while ($p < $sLen && ord($s{$p}) > 32) $p++;
863
-   $w = substr($s, $p0, $p - $p0);
864
-   return true; }
858
+    $sLen = strlen($s);
859
+    while ($p < $sLen && ord($s{$p}) <= 32) $p++;
860
+    if ($p >= $sLen) return false;
861
+    $p0 = $p;
862
+    while ($p < $sLen && ord($s{$p}) > 32) $p++;
863
+    $w = substr($s, $p0, $p - $p0);
864
+    return true; }
865 865
 
866 866
 /**
867 867
 * @access private
868 868
 * @return boolean  true on success, false on error.
869 869
 */
870 870
 function parseQuotedString ($s, &$p, &$w) {
871
-   $sLen = strlen($s);
872
-   while ($p < $sLen && ord($s{$p}) <= 32) $p++;
873
-   if ($p >= $sLen) return false;
874
-   if (substr($s,$p,1) != '"') return false;
875
-   $p++; $p0 = $p;
876
-   while ($p < $sLen && $s{$p} != '"') $p++;
877
-   if ($p >= $sLen) return false;
878
-   $w = substr($s, $p0, $p - $p0);
879
-   $p++;
880
-   return true; }
871
+    $sLen = strlen($s);
872
+    while ($p < $sLen && ord($s{$p}) <= 32) $p++;
873
+    if ($p >= $sLen) return false;
874
+    if (substr($s,$p,1) != '"') return false;
875
+    $p++; $p0 = $p;
876
+    while ($p < $sLen && $s{$p} != '"') $p++;
877
+    if ($p >= $sLen) return false;
878
+    $w = substr($s, $p0, $p - $p0);
879
+    $p++;
880
+    return true; }
881 881
 
882 882
 /**
883 883
 * @access private
884 884
 * @return boolean  true on success, false on error.
885 885
 */
886 886
 function parseWordOrQuotedString ($s, &$p, &$w) {
887
-   $sLen = strlen($s);
888
-   while ($p < $sLen && ord($s{$p}) <= 32) $p++;
889
-   if ($p >= $sLen) return false;
890
-   if (substr($s,$p,1) == '"')
891
-      return $this->parseQuotedString($s,$p,$w);
887
+    $sLen = strlen($s);
888
+    while ($p < $sLen && ord($s{$p}) <= 32) $p++;
889
+    if ($p >= $sLen) return false;
890
+    if (substr($s,$p,1) == '"')
891
+        return $this->parseQuotedString($s,$p,$w);
892 892
     else
893
-      return $this->parseWord($s,$p,$w); }
893
+        return $this->parseWord($s,$p,$w); }
894 894
 
895 895
 /**
896 896
 * Combine two file system paths.
897 897
 * @access private
898 898
 */
899 899
 function combineFileSystemPath ($path1, $path2) {
900
-   if ($path1 == '' || $path2 == '') return $path2;
901
-   $s = $path1;
902
-   if (substr($s,-1) != '\\' && substr($s,-1) != '/') $s = $s . "/";
903
-   if (substr($path2,0,1) == '\\' || substr($path2,0,1) == '/')
904
-      $s = $s . substr($path2,1);
900
+    if ($path1 == '' || $path2 == '') return $path2;
901
+    $s = $path1;
902
+    if (substr($s,-1) != '\\' && substr($s,-1) != '/') $s = $s . "/";
903
+    if (substr($path2,0,1) == '\\' || substr($path2,0,1) == '/')
904
+        $s = $s . substr($path2,1);
905 905
     else
906
-      $s = $s . $path2;
907
-   return $s; }
906
+        $s = $s . $path2;
907
+    return $s; }
908 908
 
909 909
 /**
910 910
 * @access private
911 911
 */
912 912
 function triggerError ($msg) {
913
-   trigger_error ("MiniTemplator error: $msg", E_USER_ERROR); }
913
+    trigger_error ("MiniTemplator error: $msg", E_USER_ERROR); }
914 914
 
915 915
 /**
916 916
 * @access private
917 917
 */
918 918
 function programLogicError ($errorId) {
919
-   die ("MiniTemplator: Program logic error $errorId.\n"); }
919
+    die ("MiniTemplator: Program logic error $errorId.\n"); }
920 920
 
921 921
 }
922 922
 ?>
Please login to merge, or discard this patch.
Braces   +177 added lines, -82 removed lines patch added patch discarded remove patch
@@ -175,7 +175,9 @@  discard block
 block discarded – undo
175 175
    if (!$this->readFileIntoString($fileName,$s)) {
176 176
       $this->triggerError ("Error while reading template file " . $fileName . ".");
177 177
       return false; }
178
-   if (!$this->setTemplateString($s)) return false;
178
+   if (!$this->setTemplateString($s)) {
179
+       return false;
180
+   }
179 181
    return true; }
180 182
 
181 183
 /**
@@ -187,7 +189,9 @@  discard block
 block discarded – undo
187 189
 function setTemplateString ($templateString) {
188 190
    $this->templateValid = false;
189 191
    $this->template = $templateString;
190
-   if (!$this->parseTemplate()) return false;
192
+   if (!$this->parseTemplate()) {
193
+       return false;
194
+   }
191 195
    $this->reset();
192 196
    $this->templateValid = true;
193 197
    return true; }
@@ -214,10 +218,16 @@  discard block
 block discarded – undo
214 218
 function parseTemplate() {
215 219
    $this->initParsing();
216 220
    $this->beginMainBlock();
217
-   if (!$this->parseTemplateCommands()) return false;
221
+   if (!$this->parseTemplateCommands()) {
222
+       return false;
223
+   }
218 224
    $this->endMainBlock();
219
-   if (!$this->checkBlockDefinitionsComplete()) return false;
220
-   if (!$this->parseTemplateVariables()) return false;
225
+   if (!$this->checkBlockDefinitionsComplete()) {
226
+       return false;
227
+   }
228
+   if (!$this->parseTemplateVariables()) {
229
+       return false;
230
+   }
221 231
    $this->associateVariablesWithBlocks();
222 232
    return true; }
223 233
 
@@ -272,16 +282,22 @@  discard block
 block discarded – undo
272 282
    $p = 0;
273 283
    while (true) {
274 284
       $p0 = strpos($this->template,'<!--',$p);
275
-      if ($p0 === false) break;
285
+      if ($p0 === false) {
286
+          break;
287
+      }
276 288
       $p = strpos($this->template,'-->',$p0);
277 289
       if ($p === false) {
278 290
          $this->triggerError ("Invalid HTML comment in template at offset $p0.");
279 291
          return false; }
280 292
       $p += 3;
281 293
       $cmdL = substr($this->template,$p0+4,$p-$p0-7);
282
-      if (!$this->processTemplateCommand($cmdL,$p0,$p,$resumeFromStart))
283
-         return false;
284
-      if ($resumeFromStart) $p = $p0; }
294
+      if (!$this->processTemplateCommand($cmdL,$p0,$p,$resumeFromStart)) {
295
+               return false;
296
+      }
297
+      if ($resumeFromStart) {
298
+          $p = $p0;
299
+      }
300
+      }
285 301
    return true; }
286 302
 
287 303
 /**
@@ -292,20 +308,25 @@  discard block
 block discarded – undo
292 308
    $resumeFromStart = false;
293 309
    $p = 0;
294 310
    $cmd = '';
295
-   if (!$this->parseWord($cmdL,$p,$cmd)) return true;
311
+   if (!$this->parseWord($cmdL,$p,$cmd)) {
312
+       return true;
313
+   }
296 314
    $parms = substr($cmdL,$p);
297 315
    switch (strtoupper($cmd)) {
298 316
       case '$BEGINBLOCK':
299
-         if (!$this->processBeginBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd))
300
-            return false;
317
+         if (!$this->processBeginBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd)) {
318
+                     return false;
319
+         }
301 320
          break;
302 321
       case '$ENDBLOCK':
303
-         if (!$this->processEndBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd))
304
-            return false;
322
+         if (!$this->processEndBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd)) {
323
+                     return false;
324
+         }
305 325
          break;
306 326
       case '$INCLUDE':
307
-         if (!$this->processincludeCmd($parms,$cmdTPosBegin,$cmdTPosEnd))
308
-            return false;
327
+         if (!$this->processincludeCmd($parms,$cmdTPosBegin,$cmdTPosEnd)) {
328
+                     return false;
329
+         }
309 330
          $resumeFromStart = true;
310 331
          break;
311 332
       default:
@@ -377,8 +398,9 @@  discard block
 block discarded – undo
377 398
    $btr =& $this->blockTab[$blockNo];
378 399
    $btr = array();
379 400
    $btr['blockName'] = $blockName;
380
-   if (!$this->lookupBlockName($blockName,$btr['nextWithSameName']))
381
-      $btr['nextWithSameName'] = -1;
401
+   if (!$this->lookupBlockName($blockName,$btr['nextWithSameName'])) {
402
+         $btr['nextWithSameName'] = -1;
403
+   }
382 404
    $btr['definitionIsOpen'] = true;
383 405
    $btr['instances'] = 0;
384 406
    $btr['firstBlockInstNo'] = -1;
@@ -428,7 +450,9 @@  discard block
 block discarded – undo
428 450
    if (strlen($this->template) > $this->maxInclTemplateSize) {
429 451
       $this->triggerError ("Subtemplate include aborted because the internal template string is longer than $this->maxInclTemplateSize characters.");
430 452
       return false; }
431
-   if (!$this->loadSubtemplate($subtemplateName,$subtemplate)) return false;
453
+   if (!$this->loadSubtemplate($subtemplateName,$subtemplate)) {
454
+       return false;
455
+   }
432 456
    // (Copying the template to insert a subtemplate is a bit slow. In a future implementation of MiniTemplator,
433 457
    // a table could be used that contains references to the string fragments.)
434 458
    $this->template = substr($this->template,0,$tPos1) . $subtemplate . substr($this->template,$tPos2);
@@ -443,7 +467,9 @@  discard block
 block discarded – undo
443 467
    $p = 0;
444 468
    while (true) {
445 469
       $p = strpos($this->template, '${', $p);
446
-      if ($p === false) break;
470
+      if ($p === false) {
471
+          break;
472
+      }
447 473
       $p0 = $p;
448 474
       $p = strpos($this->template, '}', $p);
449 475
       if ($p === false) {
@@ -461,8 +487,9 @@  discard block
 block discarded – undo
461 487
 * @access private
462 488
 */
463 489
 function registerVariableReference ($varName, $tPosBegin, $tPosEnd) {
464
-   if (!$this->lookupVariableName($varName,$varNo))
465
-      $this->registerVariable($varName,$varNo);
490
+   if (!$this->lookupVariableName($varName,$varNo)) {
491
+         $this->registerVariable($varName,$varNo);
492
+   }
466 493
    $varRefNo = $this->varRefTabCnt++;
467 494
    $vrtr =& $this->varRefTab[$varRefNo];
468 495
    $vrtr = array();
@@ -502,12 +529,14 @@  discard block
 block discarded – undo
502 529
             $nextBlockNo += 1;
503 530
             continue; }}
504 531
       $btr =& $this->blockTab[$activeBlockNo];
505
-      if ($varRefTPos < $btr['tPosBegin'])
506
-         $this->programLogicError(1);
532
+      if ($varRefTPos < $btr['tPosBegin']) {
533
+               $this->programLogicError(1);
534
+      }
507 535
       $blockVarNo = $btr['blockVarCnt']++;
508 536
       $btr['blockVarNoToVarNoMap'][$blockVarNo] = $varNo;
509
-      if ($btr['firstVarRefNo'] == -1)
510
-         $btr['firstVarRefNo'] = $varRefNo;
537
+      if ($btr['firstVarRefNo'] == -1) {
538
+               $btr['firstVarRefNo'] = $varRefNo;
539
+      }
511 540
       $vrtr['blockNo'] = $activeBlockNo;
512 541
       $vrtr['blockVarNo'] = $blockVarNo;
513 542
       $varRefNo += 1; }}
@@ -523,8 +552,9 @@  discard block
 block discarded – undo
523 552
 * @access public
524 553
 */
525 554
 function reset() {
526
-   for ($varNo=0; $varNo<$this->varTabCnt; $varNo++)
527
-      $this->varTab[$varNo]['varValue'] = '';
555
+   for ($varNo=0; $varNo<$this->varTabCnt; $varNo++) {
556
+         $this->varTab[$varNo]['varValue'] = '';
557
+   }
528 558
    for ($blockNo=0; $blockNo<$this->blockTabCnt; $blockNo++) {
529 559
       $btr =& $this->blockTab[$blockNo];
530 560
       $btr['instances'] = 0;
@@ -551,7 +581,9 @@  discard block
 block discarded – undo
551 581
 function setVariable ($variableName, $variableValue, $isOptional=false) {
552 582
    if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }
553 583
    if (!$this->lookupVariableName($variableName,$varNo)) {
554
-      if ($isOptional) return true;
584
+      if ($isOptional) {
585
+          return true;
586
+      }
555 587
       $this->triggerError ("Variable \"$variableName\" not defined in template.");
556 588
       return false; }
557 589
    $this->varTab[$varNo]['varValue'] = $variableValue;
@@ -619,20 +651,23 @@  discard block
 block discarded – undo
619 651
    $btr =& $this->blockTab[$blockNo];
620 652
    $this->registerBlockInstance ($blockInstNo);
621 653
    $bitr =& $this->blockInstTab[$blockInstNo];
622
-   if ($btr['firstBlockInstNo'] == -1)
623
-      $btr['firstBlockInstNo'] = $blockInstNo;
624
-   if ($btr['lastBlockInstNo'] != -1)
625
-      $this->blockInstTab[$btr['lastBlockInstNo']]['nextBlockInstNo'] = $blockInstNo;
654
+   if ($btr['firstBlockInstNo'] == -1) {
655
+         $btr['firstBlockInstNo'] = $blockInstNo;
656
+   }
657
+   if ($btr['lastBlockInstNo'] != -1) {
658
+         $this->blockInstTab[$btr['lastBlockInstNo']]['nextBlockInstNo'] = $blockInstNo;
659
+   }
626 660
          // set forward pointer of chain
627 661
    $btr['lastBlockInstNo'] = $blockInstNo;
628 662
    $parentBlockNo = $btr['parentBlockNo'];
629 663
    $blockVarCnt = $btr['blockVarCnt'];
630 664
    $bitr['blockNo'] = $blockNo;
631 665
    $bitr['instanceLevel'] = $btr['instances']++;
632
-   if ($parentBlockNo == -1)
633
-      $bitr['parentInstLevel'] = -1;
634
-    else
635
-      $bitr['parentInstLevel'] = $this->blockTab[$parentBlockNo]['instances'];
666
+   if ($parentBlockNo == -1) {
667
+         $bitr['parentInstLevel'] = -1;
668
+   } else {
669
+          $bitr['parentInstLevel'] = $this->blockTab[$parentBlockNo]['instances'];
670
+    }
636 671
    $bitr['nextBlockInstNo'] = -1;
637 672
    $bitr['blockVarTab'] = array();
638 673
    // copy instance variables for this block
@@ -666,7 +701,9 @@  discard block
 block discarded – undo
666 701
 */
667 702
 function generateOutput () {
668 703
    $this->outputMode = 0;
669
-   if (!$this->generateOutputPage()) return false;
704
+   if (!$this->generateOutputPage()) {
705
+       return false;
706
+   }
670 707
    return true; }
671 708
 
672 709
 /**
@@ -677,7 +714,9 @@  discard block
 block discarded – undo
677 714
 */
678 715
 function generateOutputToFile ($fileName) {
679 716
    $fh = fopen($fileName,"wb");
680
-   if ($fh === false) return false;
717
+   if ($fh === false) {
718
+       return false;
719
+   }
681 720
    $this->outputMode = 1;
682 721
    $this->outputFileHandle = $fh;
683 722
    $ok = $this->generateOutputPage();
@@ -695,7 +734,9 @@  discard block
 block discarded – undo
695 734
    $outputString = "Error";
696 735
    $this->outputMode = 2;
697 736
    $this->outputString = "";
698
-   if (!$this->generateOutputPage()) return false;
737
+   if (!$this->generateOutputPage()) {
738
+       return false;
739
+   }
699 740
    $outputString = $this->outputString;
700 741
    return true; }
701 742
 
@@ -705,14 +746,18 @@  discard block
 block discarded – undo
705 746
 */
706 747
 function generateOutputPage() {
707 748
    if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }
708
-   if ($this->blockTab[0]['instances'] == 0)
709
-      $this->addBlockByNo (0);        // add main block
749
+   if ($this->blockTab[0]['instances'] == 0) {
750
+         $this->addBlockByNo (0);
751
+   }
752
+   // add main block
710 753
    for ($blockNo=0; $blockNo < $this->blockTabCnt; $blockNo++) {
711 754
        $btr =& $this->blockTab[$blockNo];
712 755
        $btr['currBlockInstNo'] = $btr['firstBlockInstNo']; }
713 756
    $this->outputError = false;
714 757
    $this->writeBlockInstances (0, -1);
715
-   if ($this->outputError) return false;
758
+   if ($this->outputError) {
759
+       return false;
760
+   }
716 761
    return true; }
717 762
 
718 763
 /**
@@ -725,11 +770,16 @@  discard block
 block discarded – undo
725 770
    $btr =& $this->blockTab[$blockNo];
726 771
    while (!$this->outputError) {
727 772
       $blockInstNo = $btr['currBlockInstNo'];
728
-      if ($blockInstNo == -1) break;
773
+      if ($blockInstNo == -1) {
774
+          break;
775
+      }
729 776
       $bitr =& $this->blockInstTab[$blockInstNo];
730
-      if ($bitr['parentInstLevel'] < $parentInstLevel)
731
-         $this->programLogicError (2);
732
-      if ($bitr['parentInstLevel'] > $parentInstLevel) break;
777
+      if ($bitr['parentInstLevel'] < $parentInstLevel) {
778
+               $this->programLogicError (2);
779
+      }
780
+      if ($bitr['parentInstLevel'] > $parentInstLevel) {
781
+          break;
782
+      }
733 783
       $this->writeBlockInstance ($blockInstNo);
734 784
       $btr['currBlockInstNo'] = $bitr['nextBlockInstNo']; }}
735 785
 
@@ -762,15 +812,17 @@  discard block
 block discarded – undo
762 812
          if ($subBtr['tPosBegin'] < $tPos2) {
763 813
             $tPos2 = $subBtr['tPosBegin'];
764 814
             $kind = 2; }}
765
-      if ($tPos2 > $tPos)
766
-         $this->writeString (substr($this->template,$tPos,$tPos2-$tPos));
815
+      if ($tPos2 > $tPos) {
816
+               $this->writeString (substr($this->template,$tPos,$tPos2-$tPos));
817
+      }
767 818
       switch ($kind) {
768 819
          case 0:         // end of block
769 820
             return;
770 821
          case 1:         // variable
771 822
             $vrtr =& $this->varRefTab[$varRefNo];
772
-            if ($vrtr['blockNo'] != $blockNo)
773
-               $this->programLogicError (4);
823
+            if ($vrtr['blockNo'] != $blockNo) {
824
+                           $this->programLogicError (4);
825
+            }
774 826
             $variableValue = $bitr['blockVarTab'][$vrtr['blockVarNo']];
775 827
             $this->writeString ($variableValue);
776 828
             $tPos = $vrtr['tPosEnd'];
@@ -778,8 +830,9 @@  discard block
 block discarded – undo
778 830
             break;
779 831
          case 2:         // sub block
780 832
             $subBtr =& $this->blockTab[$subBlockNo];
781
-            if ($subBtr['parentBlockNo'] != $blockNo)
782
-               $this->programLogicError (3);
833
+            if ($subBtr['parentBlockNo'] != $blockNo) {
834
+                           $this->programLogicError (3);
835
+            }
783 836
             $this->writeBlockInstances ($subBlockNo, $bitr['instanceLevel']);  // recursive call
784 837
             $tPos = $subBtr['tPosEnd'];
785 838
             $subBlockNo += 1;
@@ -789,15 +842,20 @@  discard block
 block discarded – undo
789 842
 * @access private
790 843
 */
791 844
 function writeString ($s) {
792
-   if ($this->outputError) return;
845
+   if ($this->outputError) {
846
+       return;
847
+   }
793 848
    switch ($this->outputMode) {
794 849
       case 0:            // output to PHP output stream
795
-         if (!print($s))
796
-            $this->outputError = true;
850
+         if (!print($s)) {
851
+                     $this->outputError = true;
852
+         }
797 853
          break;
798 854
       case 1:            // output to file
799 855
          $rc = fwrite($this->outputFileHandle, $s);
800
-         if ($rc === false) $this->outputError = true;
856
+         if ($rc === false) {
857
+             $this->outputError = true;
858
+         }
801 859
          break;
802 860
       case 2:            // output to string
803 861
          $this->outputString .= $s;
@@ -812,7 +870,9 @@  discard block
 block discarded – undo
812 870
 */
813 871
 function lookupVariableName ($varName, &$varNo) {
814 872
    $x =& $this->varNameToNoMap[strtoupper($varName)];
815
-   if (!isset($x)) return false;
873
+   if (!isset($x)) {
874
+       return false;
875
+   }
816 876
    $varNo = $x;
817 877
    return true; }
818 878
 
@@ -825,7 +885,9 @@  discard block
 block discarded – undo
825 885
 */
826 886
 function lookupBlockName ($blockName, &$blockNo) {
827 887
    $x =& $this->blockNameToNoMap[strtoupper($blockName)];
828
-   if (!isset($x)) return false;
888
+   if (!isset($x)) {
889
+       return false;
890
+   }
829 891
    $blockNo = $x;
830 892
    return true; }
831 893
 
@@ -839,15 +901,21 @@  discard block
 block discarded – undo
839 901
 function readFileIntoString ($fileName, &$s) {
840 902
    if (function_exists('version_compare') && version_compare(phpversion(),"4.3.0",">=")) {
841 903
       $s = file_get_contents($fileName);
842
-      if ($s === false) return false;
904
+      if ($s === false) {
905
+          return false;
906
+      }
843 907
       return true; }
844 908
    $fh = fopen($fileName,"rb");
845
-   if ($fh === false) return false;
909
+   if ($fh === false) {
910
+       return false;
911
+   }
846 912
    $fileSize = filesize($fileName);
847 913
    if ($fileSize === false) {fclose ($fh); return false; }
848 914
    $s = fread($fh,$fileSize);
849 915
    fclose ($fh);
850
-   if (strlen($s) != $fileSize) return false;
916
+   if (strlen($s) != $fileSize) {
917
+       return false;
918
+   }
851 919
    return true; }
852 920
 
853 921
 /**
@@ -856,10 +924,16 @@  discard block
 block discarded – undo
856 924
 */
857 925
 function parseWord ($s, &$p, &$w) {
858 926
    $sLen = strlen($s);
859
-   while ($p < $sLen && ord($s{$p}) <= 32) $p++;
860
-   if ($p >= $sLen) return false;
927
+   while ($p < $sLen && ord($s{$p}) <= 32) {
928
+       $p++;
929
+   }
930
+   if ($p >= $sLen) {
931
+       return false;
932
+   }
861 933
    $p0 = $p;
862
-   while ($p < $sLen && ord($s{$p}) > 32) $p++;
934
+   while ($p < $sLen && ord($s{$p}) > 32) {
935
+       $p++;
936
+   }
863 937
    $w = substr($s, $p0, $p - $p0);
864 938
    return true; }
865 939
 
@@ -869,12 +943,22 @@  discard block
 block discarded – undo
869 943
 */
870 944
 function parseQuotedString ($s, &$p, &$w) {
871 945
    $sLen = strlen($s);
872
-   while ($p < $sLen && ord($s{$p}) <= 32) $p++;
873
-   if ($p >= $sLen) return false;
874
-   if (substr($s,$p,1) != '"') return false;
946
+   while ($p < $sLen && ord($s{$p}) <= 32) {
947
+       $p++;
948
+   }
949
+   if ($p >= $sLen) {
950
+       return false;
951
+   }
952
+   if (substr($s,$p,1) != '"') {
953
+       return false;
954
+   }
875 955
    $p++; $p0 = $p;
876
-   while ($p < $sLen && $s{$p} != '"') $p++;
877
-   if ($p >= $sLen) return false;
956
+   while ($p < $sLen && $s{$p} != '"') {
957
+       $p++;
958
+   }
959
+   if ($p >= $sLen) {
960
+       return false;
961
+   }
878 962
    $w = substr($s, $p0, $p - $p0);
879 963
    $p++;
880 964
    return true; }
@@ -885,25 +969,36 @@  discard block
 block discarded – undo
885 969
 */
886 970
 function parseWordOrQuotedString ($s, &$p, &$w) {
887 971
    $sLen = strlen($s);
888
-   while ($p < $sLen && ord($s{$p}) <= 32) $p++;
889
-   if ($p >= $sLen) return false;
890
-   if (substr($s,$p,1) == '"')
891
-      return $this->parseQuotedString($s,$p,$w);
892
-    else
893
-      return $this->parseWord($s,$p,$w); }
972
+   while ($p < $sLen && ord($s{$p}) <= 32) {
973
+       $p++;
974
+   }
975
+   if ($p >= $sLen) {
976
+       return false;
977
+   }
978
+   if (substr($s,$p,1) == '"') {
979
+         return $this->parseQuotedString($s,$p,$w);
980
+   } else {
981
+          return $this->parseWord($s,$p,$w);
982
+    }
983
+    }
894 984
 
895 985
 /**
896 986
 * Combine two file system paths.
897 987
 * @access private
898 988
 */
899 989
 function combineFileSystemPath ($path1, $path2) {
900
-   if ($path1 == '' || $path2 == '') return $path2;
990
+   if ($path1 == '' || $path2 == '') {
991
+       return $path2;
992
+   }
901 993
    $s = $path1;
902
-   if (substr($s,-1) != '\\' && substr($s,-1) != '/') $s = $s . "/";
903
-   if (substr($path2,0,1) == '\\' || substr($path2,0,1) == '/')
904
-      $s = $s . substr($path2,1);
905
-    else
906
-      $s = $s . $path2;
994
+   if (substr($s,-1) != '\\' && substr($s,-1) != '/') {
995
+       $s = $s . "/";
996
+   }
997
+   if (substr($path2,0,1) == '\\' || substr($path2,0,1) == '/') {
998
+         $s = $s . substr($path2,1);
999
+   } else {
1000
+          $s = $s . $path2;
1001
+    }
907 1002
    return $s; }
908 1003
 
909 1004
 /**
Please login to merge, or discard this patch.
lib/jimIcon.php 3 patches
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -67,13 +67,13 @@  discard block
 block discarded – undo
67 67
                         $entry = substr($ico, 6 + 16 * $i, 16);
68 68
                         if (!$entry || strlen($entry) < 16)
69 69
                                 continue;
70
-                        $e = unpack("Cwidth/" .
71
-                                    "Cheight/" .
72
-                                    "Ccolors/" .
73
-                                    "Czero/" .
74
-                                    "vplanes/" .
75
-                                    "vbpp/" .
76
-                                    "Vsize/" .
70
+                        $e = unpack("Cwidth/".
71
+                                    "Cheight/".
72
+                                    "Ccolors/".
73
+                                    "Czero/".
74
+                                    "vplanes/".
75
+                                    "vbpp/".
76
+                                    "Vsize/".
77 77
                                     "Voffset/",
78 78
                                     $entry);
79 79
                         if ($e["width"] == 0)
@@ -122,16 +122,16 @@  discard block
 block discarded – undo
122 122
                 // directory entry.
123 123
                 $bitmapinfo = unpack("Vsize", $data);
124 124
                 if ($bitmapinfo["size"] == 40) {
125
-                        $info = unpack("Vsize/" .
126
-                                       "Vwidth/" .
127
-                                       "Vheight/" .
128
-                                       "vplanes/" .
129
-                                       "vbpp/" .
130
-                                       "Vcompress/" .
131
-                                       "Vsize/" .
132
-                                       "Vxres/" .
133
-                                       "Vyres/" .
134
-                                       "Vpalcolors/" .
125
+                        $info = unpack("Vsize/".
126
+                                       "Vwidth/".
127
+                                       "Vheight/".
128
+                                       "vplanes/".
129
+                                       "vbpp/".
130
+                                       "Vcompress/".
131
+                                       "Vsize/".
132
+                                       "Vxres/".
133
+                                       "Vyres/".
134
+                                       "Vpalcolors/".
135 135
                                        "Vimpcolors/", $data);
136 136
                         if ($e["bpp"] == 0) {
137 137
                                 $e["bpp"] = $info["bpp"];
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
                                         $pixel1 = $palette[$p >> 4];
213 213
                                         $pixel2 = $palette[$p & 0x0f];
214 214
                                         $XOR[$y][$x] = $pixel1;
215
-                                        $XOR[$y][$x+1] = $pixel2;
215
+                                        $XOR[$y][$x + 1] = $pixel2;
216 216
                                         $x += 2;
217 217
                                         $offset++;
218 218
                                 } elseif ($bpp == 8) {
Please login to merge, or discard this patch.
Braces   +21 added lines, -14 removed lines patch added patch discarded remove patch
@@ -24,13 +24,15 @@  discard block
 block discarded – undo
24 24
                 $r = ord($str[2]);
25 25
                 if (strlen($str) > 3) {
26 26
                         $a = 127 - (ord($str[3]) / 2);
27
-                        if ($a != 0 && $a != 127)
28
-                                $this->had_alpha = 1;
27
+                        if ($a != 0 && $a != 127) {
28
+                                                        $this->had_alpha = 1;
29
+                        }
29 30
                 } else {
30 31
                         $a = 0;
31 32
                 }
32
-                if ($a != 127)
33
-                        $this->all_transaprent = 0;
33
+                if ($a != 127) {
34
+                                        $this->all_transaprent = 0;
35
+                }
34 36
                 return imagecolorallocatealpha($img, $r, $g, $b, $a);
35 37
         }
36 38
 
@@ -65,8 +67,9 @@  discard block
 block discarded – undo
65 67
                 $most_pixels = 0;
66 68
                 for ($i = 0; $i < $h["num"]; $i++) {
67 69
                         $entry = substr($ico, 6 + 16 * $i, 16);
68
-                        if (!$entry || strlen($entry) < 16)
69
-                                continue;
70
+                        if (!$entry || strlen($entry) < 16) {
71
+                                                        continue;
72
+                        }
70 73
                         $e = unpack("Cwidth/" .
71 74
                                     "Cheight/" .
72 75
                                     "Ccolors/" .
@@ -76,10 +79,12 @@  discard block
 block discarded – undo
76 79
                                     "Vsize/" .
77 80
                                     "Voffset/",
78 81
                                     $entry);
79
-                        if ($e["width"] == 0)
80
-                                $e["width"] = 256;
81
-                        if ($e["height"] == 0)
82
-                                $e["height"] = 256;
82
+                        if ($e["width"] == 0) {
83
+                                                        $e["width"] = 256;
84
+                        }
85
+                        if ($e["height"] == 0) {
86
+                                                        $e["height"] = 256;
87
+                        }
83 88
                         if ($e["zero"] != 0) {
84 89
                                 $this->error = "nonzero reserved field";
85 90
                                 return false;
@@ -226,8 +231,9 @@  discard block
 block discarded – undo
226 231
                                 }
227 232
                         }
228 233
                         // End of row padding
229
-                        while ($offset & 3)
230
-                                $offset++;
234
+                        while ($offset & 3) {
235
+                                                        $offset++;
236
+                        }
231 237
                 }
232 238
 
233 239
                 // Now the "AND" image, which is 1 bit per pixel.  Ignore
@@ -261,8 +267,9 @@  discard block
 block discarded – undo
261 267
                         }
262 268
 
263 269
                         // End of row padding
264
-                        while ($offset & 3)
265
-                                $offset++;
270
+                        while ($offset & 3) {
271
+                                                        $offset++;
272
+                        }
266 273
                 }
267 274
                 return $img;
268 275
         }
Please login to merge, or discard this patch.
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -123,16 +123,16 @@  discard block
 block discarded – undo
123 123
                 $bitmapinfo = unpack("Vsize", $data);
124 124
                 if ($bitmapinfo["size"] == 40) {
125 125
                         $info = unpack("Vsize/" .
126
-                                       "Vwidth/" .
127
-                                       "Vheight/" .
128
-                                       "vplanes/" .
129
-                                       "vbpp/" .
130
-                                       "Vcompress/" .
131
-                                       "Vsize/" .
132
-                                       "Vxres/" .
133
-                                       "Vyres/" .
134
-                                       "Vpalcolors/" .
135
-                                       "Vimpcolors/", $data);
126
+                                        "Vwidth/" .
127
+                                        "Vheight/" .
128
+                                        "vplanes/" .
129
+                                        "vbpp/" .
130
+                                        "Vcompress/" .
131
+                                        "Vsize/" .
132
+                                        "Vxres/" .
133
+                                        "Vyres/" .
134
+                                        "Vpalcolors/" .
135
+                                        "Vimpcolors/", $data);
136 136
                         if ($e["bpp"] == 0) {
137 137
                                 $e["bpp"] = $info["bpp"];
138 138
                         }
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
                         for ($y = 0; $y < $height; $y++) {
240 240
                                 for ($x = 0; $x < $width; $x++) {
241 241
                                         imagesetpixel($img, $x, $y,
242
-                                                      $XOR[$y][$x]);
242
+                                                        $XOR[$y][$x]);
243 243
                                 }
244 244
                         }
245 245
                         return $img;
@@ -250,10 +250,10 @@  discard block
 block discarded – undo
250 250
                         $x = 0;
251 251
                         while ($x < $width) {
252 252
                                 for ($b = 0x80;
253
-                                     $b > 0 && $x < $width; $b >>= 1) {
253
+                                        $b > 0 && $x < $width; $b >>= 1) {
254 254
                                         if (!(ord($data[$offset]) & $b)) {
255 255
                                                 imagesetpixel($img, $x, $y,
256
-                                                              $XOR[$y][$x]);
256
+                                                                $XOR[$y][$x]);
257 257
                                         }
258 258
                                         $x++;
259 259
                                 }
Please login to merge, or discard this patch.
lib/phpqrcode/qrconst.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -45,10 +45,10 @@
 block discarded – undo
45 45
 	// Supported output formats
46 46
 	
47 47
 	define('QR_FORMAT_TEXT', 0);
48
-	define('QR_FORMAT_PNG',  1);
48
+	define('QR_FORMAT_PNG', 1);
49 49
 	
50 50
 	class qrstr {
51 51
 		public static function set(&$srctab, $x, $y, $repl, $replLen = false) {
52
-			$srctab[$y] = substr_replace($srctab[$y], ($replLen !== false)?substr($repl,0,$replLen):$repl, $x, ($replLen !== false)?$replLen:strlen($repl));
52
+			$srctab[$y] = substr_replace($srctab[$y], ($replLen !== false) ?substr($repl, 0, $replLen) : $repl, $x, ($replLen !== false) ? $replLen : strlen($repl));
53 53
 		}
54 54
 	}	
55 55
\ No newline at end of file
Please login to merge, or discard this patch.
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -26,29 +26,29 @@
 block discarded – undo
26 26
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
27 27
  */
28 28
  
29
-	// Encoding modes
29
+    // Encoding modes
30 30
 	 
31
-	define('QR_MODE_NUL', -1);
32
-	define('QR_MODE_NUM', 0);
33
-	define('QR_MODE_AN', 1);
34
-	define('QR_MODE_8', 2);
35
-	define('QR_MODE_KANJI', 3);
36
-	define('QR_MODE_STRUCTURE', 4);
31
+    define('QR_MODE_NUL', -1);
32
+    define('QR_MODE_NUM', 0);
33
+    define('QR_MODE_AN', 1);
34
+    define('QR_MODE_8', 2);
35
+    define('QR_MODE_KANJI', 3);
36
+    define('QR_MODE_STRUCTURE', 4);
37 37
 
38
-	// Levels of error correction.
38
+    // Levels of error correction.
39 39
 
40
-	define('QR_ECLEVEL_L', 0);
41
-	define('QR_ECLEVEL_M', 1);
42
-	define('QR_ECLEVEL_Q', 2);
43
-	define('QR_ECLEVEL_H', 3);
40
+    define('QR_ECLEVEL_L', 0);
41
+    define('QR_ECLEVEL_M', 1);
42
+    define('QR_ECLEVEL_Q', 2);
43
+    define('QR_ECLEVEL_H', 3);
44 44
 	
45
-	// Supported output formats
45
+    // Supported output formats
46 46
 	
47
-	define('QR_FORMAT_TEXT', 0);
48
-	define('QR_FORMAT_PNG',  1);
47
+    define('QR_FORMAT_TEXT', 0);
48
+    define('QR_FORMAT_PNG',  1);
49 49
 	
50
-	class qrstr {
51
-		public static function set(&$srctab, $x, $y, $repl, $replLen = false) {
52
-			$srctab[$y] = substr_replace($srctab[$y], ($replLen !== false)?substr($repl,0,$replLen):$repl, $x, ($replLen !== false)?$replLen:strlen($repl));
53
-		}
54
-	}	
55 50
\ No newline at end of file
51
+    class qrstr {
52
+        public static function set(&$srctab, $x, $y, $repl, $replLen = false) {
53
+            $srctab[$y] = substr_replace($srctab[$y], ($replLen !== false)?substr($repl,0,$replLen):$repl, $x, ($replLen !== false)?$replLen:strlen($repl));
54
+        }
55
+    }	
56 56
\ No newline at end of file
Please login to merge, or discard this patch.
lib/phpqrcode/tools/merge.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -51,11 +51,11 @@
 block discarded – undo
51 51
     
52 52
     $outputCode = '';
53 53
     
54
-    foreach($fileList as $fileName) {
54
+    foreach ($fileList as $fileName) {
55 55
         $outputCode .= "\n\n".'//---- '.basename($fileName).' -----------------------------'."\n\n";
56 56
         $anotherCode = file_get_contents($fileName);
57
-        $anotherCode = preg_replace ('/^<\?php/', '', $anotherCode);
58
-        $anotherCode = preg_replace ('/\?>\*$/', '', $anotherCode);
57
+        $anotherCode = preg_replace('/^<\?php/', '', $anotherCode);
58
+        $anotherCode = preg_replace('/\?>\*$/', '', $anotherCode);
59 59
         $outputCode .= "\n\n".$anotherCode."\n\n";
60 60
     }
61 61
     
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@
 block discarded – undo
59 59
         $outputCode .= "\n\n".$anotherCode."\n\n";
60 60
     }
61 61
     
62
-	$versionDataEx = explode("\n", file_get_contents($versionFile));
62
+    $versionDataEx = explode("\n", file_get_contents($versionFile));
63 63
 	
64 64
     $outputContents = file_get_contents($headerFile);
65 65
     $outputContents .= "\n\n/*\n * Version: ".trim($versionDataEx[0])."\n * Build: ".trim($versionDataEx[1])."\n */\n\n";
Please login to merge, or discard this patch.
lib/phpqrcode/tools/merged_config.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -5,13 +5,13 @@
 block discarded – undo
5 5
  * Config file, tuned-up for merged verion
6 6
  */
7 7
      
8
-    define('QR_CACHEABLE', false);       // use cache - more disk reads but less CPU power, masks and format templates are stored there
9
-    define('QR_CACHE_DIR', false);       // used when QR_CACHEABLE === true
10
-    define('QR_LOG_DIR', false);         // default error logs dir   
8
+    define('QR_CACHEABLE', false); // use cache - more disk reads but less CPU power, masks and format templates are stored there
9
+    define('QR_CACHE_DIR', false); // used when QR_CACHEABLE === true
10
+    define('QR_LOG_DIR', false); // default error logs dir   
11 11
     
12
-    define('QR_FIND_BEST_MASK', true);                                                          // if true, estimates best mask (spec. default, but extremally slow; set to false to significant performance boost but (propably) worst quality code
13
-    define('QR_FIND_FROM_RANDOM', 2);                                                       // if false, checks all masks available, otherwise value tells count of masks need to be checked, mask id are got randomly
14
-    define('QR_DEFAULT_MASK', 2);                                                               // when QR_FIND_BEST_MASK === false
12
+    define('QR_FIND_BEST_MASK', true); // if true, estimates best mask (spec. default, but extremally slow; set to false to significant performance boost but (propably) worst quality code
13
+    define('QR_FIND_FROM_RANDOM', 2); // if false, checks all masks available, otherwise value tells count of masks need to be checked, mask id are got randomly
14
+    define('QR_DEFAULT_MASK', 2); // when QR_FIND_BEST_MASK === false
15 15
                                                   
16
-    define('QR_PNG_MAXIMUM_SIZE',  1024);                                                       // maximum allowed png image width (in pixels), tune to make sure GD and PHP can handle such big images
16
+    define('QR_PNG_MAXIMUM_SIZE', 1024); // maximum allowed png image width (in pixels), tune to make sure GD and PHP can handle such big images
17 17
                                                   
18 18
\ No newline at end of file
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,4 +14,4 @@
 block discarded – undo
14 14
     define('QR_DEFAULT_MASK', 2);                                                               // when QR_FIND_BEST_MASK === false
15 15
                                                   
16 16
     define('QR_PNG_MAXIMUM_SIZE',  1024);                                                       // maximum allowed png image width (in pixels), tune to make sure GD and PHP can handle such big images
17
-                                                  
18 17
\ No newline at end of file
18
+                                                    
19 19
\ No newline at end of file
Please login to merge, or discard this patch.
lib/phpqrcode/qrbitstream.php 2 patches
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -49,8 +49,8 @@  discard block
 block discarded – undo
49 49
             $bstream->allocate($bits);
50 50
             
51 51
             $mask = 1 << ($bits - 1);
52
-            for($i=0; $i<$bits; $i++) {
53
-                if($num & $mask) {
52
+            for ($i = 0; $i < $bits; $i++) {
53
+                if ($num & $mask) {
54 54
                     $bstream->data[$i] = 1;
55 55
                 } else {
56 56
                     $bstream->data[$i] = 0;
@@ -66,12 +66,12 @@  discard block
 block discarded – undo
66 66
         {
67 67
             $bstream = new QRbitstream();
68 68
             $bstream->allocate($size * 8);
69
-            $p=0;
69
+            $p = 0;
70 70
 
71
-            for($i=0; $i<$size; $i++) {
71
+            for ($i = 0; $i < $size; $i++) {
72 72
                 $mask = 0x80;
73
-                for($j=0; $j<8; $j++) {
74
-                    if($data[$i] & $mask) {
73
+                for ($j = 0; $j < 8; $j++) {
74
+                    if ($data[$i] & $mask) {
75 75
                         $bstream->data[$p] = 1;
76 76
                     } else {
77 77
                         $bstream->data[$p] = 0;
@@ -91,11 +91,11 @@  discard block
 block discarded – undo
91 91
                 return -1;
92 92
             }
93 93
             
94
-            if($arg->size() == 0) {
94
+            if ($arg->size() == 0) {
95 95
                 return 0;
96 96
             }
97 97
             
98
-            if($this->size() == 0) {
98
+            if ($this->size() == 0) {
99 99
                 $this->data = $arg->data;
100 100
                 return 0;
101 101
             }
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 
114 114
             $b = QRbitstream::newFromNum($bits, $num);
115 115
             
116
-            if(is_null($b))
116
+            if (is_null($b))
117 117
                 return -1;
118 118
 
119 119
             $ret = $this->append($b);
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 
131 131
             $b = QRbitstream::newFromBytes($size, $data);
132 132
             
133
-            if(is_null($b))
133
+            if (is_null($b))
134 134
                 return -1;
135 135
 
136 136
             $ret = $this->append($b);
@@ -145,18 +145,18 @@  discard block
 block discarded – undo
145 145
         
146 146
             $size = $this->size();
147 147
 
148
-            if($size == 0) {
148
+            if ($size == 0) {
149 149
                 return array();
150 150
             }
151 151
             
152
-            $data = array_fill(0, (int)(($size + 7) / 8), 0);
153
-            $bytes = (int)($size / 8);
152
+            $data = array_fill(0, (int) (($size + 7) / 8), 0);
153
+            $bytes = (int) ($size / 8);
154 154
 
155 155
             $p = 0;
156 156
             
157
-            for($i=0; $i<$bytes; $i++) {
157
+            for ($i = 0; $i < $bytes; $i++) {
158 158
                 $v = 0;
159
-                for($j=0; $j<8; $j++) {
159
+                for ($j = 0; $j < 8; $j++) {
160 160
                     $v = $v << 1;
161 161
                     $v |= $this->data[$p];
162 162
                     $p++;
@@ -164,9 +164,9 @@  discard block
 block discarded – undo
164 164
                 $data[$i] = $v;
165 165
             }
166 166
             
167
-            if($size & 7) {
167
+            if ($size & 7) {
168 168
                 $v = 0;
169
-                for($j=0; $j<($size & 7); $j++) {
169
+                for ($j = 0; $j < ($size & 7); $j++) {
170 170
                     $v = $v << 1;
171 171
                     $v |= $this->data[$p];
172 172
                     $p++;
Please login to merge, or discard this patch.
Braces   +12 added lines, -8 removed lines patch added patch discarded remove patch
@@ -108,13 +108,15 @@  discard block
 block discarded – undo
108 108
         //----------------------------------------------------------------------
109 109
         public function appendNum($bits, $num)
110 110
         {
111
-            if ($bits == 0) 
112
-                return 0;
111
+            if ($bits == 0) {
112
+                            return 0;
113
+            }
113 114
 
114 115
             $b = QRbitstream::newFromNum($bits, $num);
115 116
             
116
-            if(is_null($b))
117
-                return -1;
117
+            if(is_null($b)) {
118
+                            return -1;
119
+            }
118 120
 
119 121
             $ret = $this->append($b);
120 122
             unset($b);
@@ -125,13 +127,15 @@  discard block
 block discarded – undo
125 127
         //----------------------------------------------------------------------
126 128
         public function appendBytes($size, $data)
127 129
         {
128
-            if ($size == 0) 
129
-                return 0;
130
+            if ($size == 0) {
131
+                            return 0;
132
+            }
130 133
 
131 134
             $b = QRbitstream::newFromBytes($size, $data);
132 135
             
133
-            if(is_null($b))
134
-                return -1;
136
+            if(is_null($b)) {
137
+                            return -1;
138
+            }
135 139
 
136 140
             $ret = $this->append($b);
137 141
             unset($b);
Please login to merge, or discard this patch.
lib/phpqrcode/qrsplit.php 3 patches
Switch Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -255,14 +255,14 @@
 block discarded – undo
255 255
                 $mode = $this->identifyMode(0);
256 256
                 
257 257
                 switch ($mode) {
258
-                    case QR_MODE_NUM: $length = $this->eatNum(); break;
259
-                    case QR_MODE_AN:  $length = $this->eatAn(); break;
260
-                    case QR_MODE_KANJI:
261
-                        if ($this->modeHint == QR_MODE_KANJI)
262
-                                $length = $this->eatKanji();
263
-                        else    $length = $this->eat8();
264
-                        break;
265
-                    default: $length = $this->eat8(); break;
258
+                case QR_MODE_NUM: $length = $this->eatNum(); break;
259
+                case QR_MODE_AN:  $length = $this->eatAn(); break;
260
+                case QR_MODE_KANJI:
261
+                    if ($this->modeHint == QR_MODE_KANJI)
262
+                            $length = $this->eatKanji();
263
+                    else    $length = $this->eat8();
264
+                    break;
265
+                default: $length = $this->eat8(); break;
266 266
                 
267 267
                 }
268 268
 
Please login to merge, or discard this patch.
Spacing   +40 added lines, -40 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
             if ($pos >= strlen($str))
51 51
                 return false;
52 52
             
53
-            return ((ord($str[$pos]) >= ord('0'))&&(ord($str[$pos]) <= ord('9')));
53
+            return ((ord($str[$pos]) >= ord('0')) && (ord($str[$pos]) <= ord('9')));
54 54
         }
55 55
         
56 56
         //----------------------------------------------------------------------
@@ -70,17 +70,17 @@  discard block
 block discarded – undo
70 70
                 
71 71
             $c = $this->dataStr[$pos];
72 72
             
73
-            if(self::isdigitat($this->dataStr, $pos)) {
73
+            if (self::isdigitat($this->dataStr, $pos)) {
74 74
                 return QR_MODE_NUM;
75
-            } else if(self::isalnumat($this->dataStr, $pos)) {
75
+            } else if (self::isalnumat($this->dataStr, $pos)) {
76 76
                 return QR_MODE_AN;
77
-            } else if($this->modeHint == QR_MODE_KANJI) {
77
+            } else if ($this->modeHint == QR_MODE_KANJI) {
78 78
             
79
-                if ($pos+1 < strlen($this->dataStr)) 
79
+                if ($pos + 1 < strlen($this->dataStr)) 
80 80
                 {
81
-                    $d = $this->dataStr[$pos+1];
81
+                    $d = $this->dataStr[$pos + 1];
82 82
                     $word = (ord($c) << 8) | ord($d);
83
-                    if(($word >= 0x8140 && $word <= 0x9ffc) || ($word >= 0xe040 && $word <= 0xebbf)) {
83
+                    if (($word >= 0x8140 && $word <= 0x9ffc) || ($word >= 0xe040 && $word <= 0xebbf)) {
84 84
                         return QR_MODE_KANJI;
85 85
                     }
86 86
                 }
@@ -95,32 +95,32 @@  discard block
 block discarded – undo
95 95
             $ln = QRspec::lengthIndicator(QR_MODE_NUM, $this->input->getVersion());
96 96
 
97 97
             $p = 0;
98
-            while(self::isdigitat($this->dataStr, $p)) {
98
+            while (self::isdigitat($this->dataStr, $p)) {
99 99
                 $p++;
100 100
             }
101 101
             
102 102
             $run = $p;
103 103
             $mode = $this->identifyMode($p);
104 104
             
105
-            if($mode == QR_MODE_8) {
105
+            if ($mode == QR_MODE_8) {
106 106
                 $dif = QRinput::estimateBitsModeNum($run) + 4 + $ln
107 107
                      + QRinput::estimateBitsMode8(1)         // + 4 + l8
108 108
                      - QRinput::estimateBitsMode8($run + 1); // - 4 - l8
109
-                if($dif > 0) {
109
+                if ($dif > 0) {
110 110
                     return $this->eat8();
111 111
                 }
112 112
             }
113
-            if($mode == QR_MODE_AN) {
113
+            if ($mode == QR_MODE_AN) {
114 114
                 $dif = QRinput::estimateBitsModeNum($run) + 4 + $ln
115 115
                      + QRinput::estimateBitsModeAn(1)        // + 4 + la
116
-                     - QRinput::estimateBitsModeAn($run + 1);// - 4 - la
117
-                if($dif > 0) {
116
+                     - QRinput::estimateBitsModeAn($run + 1); // - 4 - la
117
+                if ($dif > 0) {
118 118
                     return $this->eatAn();
119 119
                 }
120 120
             }
121 121
             
122 122
             $ret = $this->input->append(QR_MODE_NUM, $run, str_split($this->dataStr));
123
-            if($ret < 0)
123
+            if ($ret < 0)
124 124
                 return -1;
125 125
 
126 126
             return $run;
@@ -129,15 +129,15 @@  discard block
 block discarded – undo
129 129
         //----------------------------------------------------------------------
130 130
         public function eatAn()
131 131
         {
132
-            $la = QRspec::lengthIndicator(QR_MODE_AN,  $this->input->getVersion());
132
+            $la = QRspec::lengthIndicator(QR_MODE_AN, $this->input->getVersion());
133 133
             $ln = QRspec::lengthIndicator(QR_MODE_NUM, $this->input->getVersion());
134 134
 
135 135
             $p = 0;
136 136
             
137
-            while(self::isalnumat($this->dataStr, $p)) {
138
-                if(self::isdigitat($this->dataStr, $p)) {
137
+            while (self::isalnumat($this->dataStr, $p)) {
138
+                if (self::isdigitat($this->dataStr, $p)) {
139 139
                     $q = $p;
140
-                    while(self::isdigitat($this->dataStr, $q)) {
140
+                    while (self::isdigitat($this->dataStr, $q)) {
141 141
                         $q++;
142 142
                     }
143 143
                     
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
                          + QRinput::estimateBitsModeNum($q - $p) + 4 + $ln
146 146
                          - QRinput::estimateBitsModeAn($q); // - 4 - la
147 147
                          
148
-                    if($dif < 0) {
148
+                    if ($dif < 0) {
149 149
                         break;
150 150
                     } else {
151 151
                         $p = $q;
@@ -157,17 +157,17 @@  discard block
 block discarded – undo
157 157
 
158 158
             $run = $p;
159 159
 
160
-            if(!self::isalnumat($this->dataStr, $p)) {
160
+            if (!self::isalnumat($this->dataStr, $p)) {
161 161
                 $dif = QRinput::estimateBitsModeAn($run) + 4 + $la
162 162
                      + QRinput::estimateBitsMode8(1) // + 4 + l8
163 163
                       - QRinput::estimateBitsMode8($run + 1); // - 4 - l8
164
-                if($dif > 0) {
164
+                if ($dif > 0) {
165 165
                     return $this->eat8();
166 166
                 }
167 167
             }
168 168
 
169 169
             $ret = $this->input->append(QR_MODE_AN, $run, str_split($this->dataStr));
170
-            if($ret < 0)
170
+            if ($ret < 0)
171 171
                 return -1;
172 172
 
173 173
             return $run;
@@ -178,12 +178,12 @@  discard block
 block discarded – undo
178 178
         {
179 179
             $p = 0;
180 180
             
181
-            while($this->identifyMode($p) == QR_MODE_KANJI) {
181
+            while ($this->identifyMode($p) == QR_MODE_KANJI) {
182 182
                 $p += 2;
183 183
             }
184 184
             
185 185
             $ret = $this->input->append(QR_MODE_KANJI, $p, str_split($this->dataStr));
186
-            if($ret < 0)
186
+            if ($ret < 0)
187 187
                 return -1;
188 188
 
189 189
             return $ret;
@@ -198,34 +198,34 @@  discard block
 block discarded – undo
198 198
             $p = 1;
199 199
             $dataStrLen = strlen($this->dataStr);
200 200
             
201
-            while($p < $dataStrLen) {
201
+            while ($p < $dataStrLen) {
202 202
                 
203 203
                 $mode = $this->identifyMode($p);
204
-                if($mode == QR_MODE_KANJI) {
204
+                if ($mode == QR_MODE_KANJI) {
205 205
                     break;
206 206
                 }
207
-                if($mode == QR_MODE_NUM) {
207
+                if ($mode == QR_MODE_NUM) {
208 208
                     $q = $p;
209
-                    while(self::isdigitat($this->dataStr, $q)) {
209
+                    while (self::isdigitat($this->dataStr, $q)) {
210 210
                         $q++;
211 211
                     }
212 212
                     $dif = QRinput::estimateBitsMode8($p) // + 4 + l8
213 213
                          + QRinput::estimateBitsModeNum($q - $p) + 4 + $ln
214 214
                          - QRinput::estimateBitsMode8($q); // - 4 - l8
215
-                    if($dif < 0) {
215
+                    if ($dif < 0) {
216 216
                         break;
217 217
                     } else {
218 218
                         $p = $q;
219 219
                     }
220
-                } else if($mode == QR_MODE_AN) {
220
+                } else if ($mode == QR_MODE_AN) {
221 221
                     $q = $p;
222
-                    while(self::isalnumat($this->dataStr, $q)) {
222
+                    while (self::isalnumat($this->dataStr, $q)) {
223 223
                         $q++;
224 224
                     }
225 225
                     $dif = QRinput::estimateBitsMode8($p)  // + 4 + l8
226 226
                          + QRinput::estimateBitsModeAn($q - $p) + 4 + $la
227 227
                          - QRinput::estimateBitsMode8($q); // - 4 - l8
228
-                    if($dif < 0) {
228
+                    if ($dif < 0) {
229 229
                         break;
230 230
                     } else {
231 231
                         $p = $q;
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
             $run = $p;
239 239
             $ret = $this->input->append(QR_MODE_8, $run, str_split($this->dataStr));
240 240
             
241
-            if($ret < 0)
241
+            if ($ret < 0)
242 242
                 return -1;
243 243
 
244 244
             return $run;
@@ -249,7 +249,7 @@  discard block
 block discarded – undo
249 249
         {
250 250
             while (strlen($this->dataStr) > 0)
251 251
             {
252
-                if($this->dataStr == '')
252
+                if ($this->dataStr == '')
253 253
                     return 0;
254 254
 
255 255
                 $mode = $this->identifyMode(0);
@@ -266,8 +266,8 @@  discard block
 block discarded – undo
266 266
                 
267 267
                 }
268 268
 
269
-                if($length == 0) return 0;
270
-                if($length < 0)  return -1;
269
+                if ($length == 0) return 0;
270
+                if ($length < 0)  return -1;
271 271
                 
272 272
                 $this->dataStr = substr($this->dataStr, $length);
273 273
             }
@@ -279,9 +279,9 @@  discard block
 block discarded – undo
279 279
             $stringLen = strlen($this->dataStr);
280 280
             $p = 0;
281 281
             
282
-            while ($p<$stringLen) {
282
+            while ($p < $stringLen) {
283 283
                 $mode = self::identifyMode(substr($this->dataStr, $p));
284
-                if($mode == QR_MODE_KANJI) {
284
+                if ($mode == QR_MODE_KANJI) {
285 285
                     $p += 2;
286 286
                 } else {
287 287
                     if (ord($this->dataStr[$p]) >= ord('a') && ord($this->dataStr[$p]) <= ord('z')) {
@@ -297,13 +297,13 @@  discard block
 block discarded – undo
297 297
         //----------------------------------------------------------------------
298 298
         public static function splitStringToQRinput($string, QRinput $input, $modeHint, $casesensitive = true)
299 299
         {
300
-            if(is_null($string) || $string == '\0' || $string == '') {
300
+            if (is_null($string) || $string == '\0' || $string == '') {
301 301
                 throw new Exception('empty string!!!');
302 302
             }
303 303
 
304 304
             $split = new QRsplit($string, $input, $modeHint);
305 305
             
306
-            if(!$casesensitive)
306
+            if (!$casesensitive)
307 307
                 $split->toUpper();
308 308
                 
309 309
             return $split->splitString();
Please login to merge, or discard this patch.
Braces   +38 added lines, -23 removed lines patch added patch discarded remove patch
@@ -47,8 +47,9 @@  discard block
 block discarded – undo
47 47
         //----------------------------------------------------------------------
48 48
         public static function isdigitat($str, $pos)
49 49
         {    
50
-            if ($pos >= strlen($str))
51
-                return false;
50
+            if ($pos >= strlen($str)) {
51
+                            return false;
52
+            }
52 53
             
53 54
             return ((ord($str[$pos]) >= ord('0'))&&(ord($str[$pos]) <= ord('9')));
54 55
         }
@@ -56,8 +57,9 @@  discard block
 block discarded – undo
56 57
         //----------------------------------------------------------------------
57 58
         public static function isalnumat($str, $pos)
58 59
         {
59
-            if ($pos >= strlen($str))
60
-                return false;
60
+            if ($pos >= strlen($str)) {
61
+                            return false;
62
+            }
61 63
                 
62 64
             return (QRinput::lookAnTable(ord($str[$pos])) >= 0);
63 65
         }
@@ -65,8 +67,9 @@  discard block
 block discarded – undo
65 67
         //----------------------------------------------------------------------
66 68
         public function identifyMode($pos)
67 69
         {
68
-            if ($pos >= strlen($this->dataStr)) 
69
-                return QR_MODE_NUL;
70
+            if ($pos >= strlen($this->dataStr)) {
71
+                            return QR_MODE_NUL;
72
+            }
70 73
                 
71 74
             $c = $this->dataStr[$pos];
72 75
             
@@ -120,8 +123,9 @@  discard block
 block discarded – undo
120 123
             }
121 124
             
122 125
             $ret = $this->input->append(QR_MODE_NUM, $run, str_split($this->dataStr));
123
-            if($ret < 0)
124
-                return -1;
126
+            if($ret < 0) {
127
+                            return -1;
128
+            }
125 129
 
126 130
             return $run;
127 131
         }
@@ -167,8 +171,9 @@  discard block
 block discarded – undo
167 171
             }
168 172
 
169 173
             $ret = $this->input->append(QR_MODE_AN, $run, str_split($this->dataStr));
170
-            if($ret < 0)
171
-                return -1;
174
+            if($ret < 0) {
175
+                            return -1;
176
+            }
172 177
 
173 178
             return $run;
174 179
         }
@@ -183,8 +188,9 @@  discard block
 block discarded – undo
183 188
             }
184 189
             
185 190
             $ret = $this->input->append(QR_MODE_KANJI, $p, str_split($this->dataStr));
186
-            if($ret < 0)
187
-                return -1;
191
+            if($ret < 0) {
192
+                            return -1;
193
+            }
188 194
 
189 195
             return $ret;
190 196
         }
@@ -238,8 +244,9 @@  discard block
 block discarded – undo
238 244
             $run = $p;
239 245
             $ret = $this->input->append(QR_MODE_8, $run, str_split($this->dataStr));
240 246
             
241
-            if($ret < 0)
242
-                return -1;
247
+            if($ret < 0) {
248
+                            return -1;
249
+            }
243 250
 
244 251
             return $run;
245 252
         }
@@ -249,8 +256,9 @@  discard block
 block discarded – undo
249 256
         {
250 257
             while (strlen($this->dataStr) > 0)
251 258
             {
252
-                if($this->dataStr == '')
253
-                    return 0;
259
+                if($this->dataStr == '') {
260
+                                    return 0;
261
+                }
254 262
 
255 263
                 $mode = $this->identifyMode(0);
256 264
                 
@@ -258,16 +266,22 @@  discard block
 block discarded – undo
258 266
                     case QR_MODE_NUM: $length = $this->eatNum(); break;
259 267
                     case QR_MODE_AN:  $length = $this->eatAn(); break;
260 268
                     case QR_MODE_KANJI:
261
-                        if ($this->modeHint == QR_MODE_KANJI)
262
-                                $length = $this->eatKanji();
263
-                        else    $length = $this->eat8();
269
+                        if ($this->modeHint == QR_MODE_KANJI) {
270
+                                                        $length = $this->eatKanji();
271
+                        } else {
272
+                            $length = $this->eat8();
273
+                        }
264 274
                         break;
265 275
                     default: $length = $this->eat8(); break;
266 276
                 
267 277
                 }
268 278
 
269
-                if($length == 0) return 0;
270
-                if($length < 0)  return -1;
279
+                if($length == 0) {
280
+                    return 0;
281
+                }
282
+                if($length < 0) {
283
+                    return -1;
284
+                }
271 285
                 
272 286
                 $this->dataStr = substr($this->dataStr, $length);
273 287
             }
@@ -303,8 +317,9 @@  discard block
 block discarded – undo
303 317
 
304 318
             $split = new QRsplit($string, $input, $modeHint);
305 319
             
306
-            if(!$casesensitive)
307
-                $split->toUpper();
320
+            if(!$casesensitive) {
321
+                            $split->toUpper();
322
+            }
308 323
                 
309 324
             return $split->splitString();
310 325
         }
Please login to merge, or discard this patch.
lib/phpqrcode/qrinput.php 4 patches
Switch Indentation   +58 added lines, -58 removed lines patch added patch discarded remove patch
@@ -201,13 +201,13 @@  discard block
 block discarded – undo
201 201
                 $version = 1;
202 202
 
203 203
             switch($this->mode) {
204
-                case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size);    break;
205
-                case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size);    break;
206
-                case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size);    break;
207
-                case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size);break;
208
-                case QR_MODE_STRUCTURE:    return STRUCTURE_HEADER_BITS;            
209
-                default:
210
-                    return 0;
204
+            case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size);    break;
205
+            case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size);    break;
206
+            case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size);    break;
207
+            case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size);break;
208
+            case QR_MODE_STRUCTURE:    return STRUCTURE_HEADER_BITS;            
209
+            default:
210
+                return 0;
211 211
             }
212 212
 
213 213
             $l = QRspec::lengthIndicator($this->mode, $version);
@@ -247,14 +247,14 @@  discard block
 block discarded – undo
247 247
                     $ret = 0;
248 248
                     
249 249
                     switch($this->mode) {
250
-                        case QR_MODE_NUM:        $ret = $this->encodeModeNum($version);    break;
251
-                        case QR_MODE_AN:        $ret = $this->encodeModeAn($version);    break;
252
-                        case QR_MODE_8:            $ret = $this->encodeMode8($version);    break;
253
-                        case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version);break;
254
-                        case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure();    break;
250
+                    case QR_MODE_NUM:        $ret = $this->encodeModeNum($version);    break;
251
+                    case QR_MODE_AN:        $ret = $this->encodeModeAn($version);    break;
252
+                    case QR_MODE_8:            $ret = $this->encodeMode8($version);    break;
253
+                    case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version);break;
254
+                    case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure();    break;
255 255
                         
256
-                        default:
257
-                            break;
256
+                    default:
257
+                        break;
258 258
                     }
259 259
                     
260 260
                     if($ret < 0)
@@ -404,14 +404,14 @@  discard block
 block discarded – undo
404 404
             $bits = $w * 10;
405 405
             
406 406
             switch($size - $w * 3) {
407
-                case 1:
408
-                    $bits += 4;
409
-                    break;
410
-                case 2:
411
-                    $bits += 7;
412
-                    break;
413
-                default:
414
-                    break;
407
+            case 1:
408
+                $bits += 4;
409
+                break;
410
+            case 2:
411
+                $bits += 7;
412
+                break;
413
+            default:
414
+                break;
415 415
             }
416 416
 
417 417
             return $bits;
@@ -500,14 +500,14 @@  discard block
 block discarded – undo
500 500
                 return false;
501 501
 
502 502
             switch($mode) {
503
-                case QR_MODE_NUM:       return self::checkModeNum($size, $data);   break;
504
-                case QR_MODE_AN:        return self::checkModeAn($size, $data);    break;
505
-                case QR_MODE_KANJI:     return self::checkModeKanji($size, $data); break;
506
-                case QR_MODE_8:         return true; break;
507
-                case QR_MODE_STRUCTURE: return true; break;
503
+            case QR_MODE_NUM:       return self::checkModeNum($size, $data);   break;
504
+            case QR_MODE_AN:        return self::checkModeAn($size, $data);    break;
505
+            case QR_MODE_KANJI:     return self::checkModeKanji($size, $data); break;
506
+            case QR_MODE_8:         return true; break;
507
+            case QR_MODE_STRUCTURE: return true; break;
508 508
                 
509
-                default:
510
-                    break;
509
+            default:
510
+                break;
511 511
             }
512 512
 
513 513
             return false;
@@ -548,35 +548,35 @@  discard block
 block discarded – undo
548 548
         {
549 549
             $payload = $bits - 4 - QRspec::lengthIndicator($mode, $version);
550 550
             switch($mode) {
551
-                case QR_MODE_NUM:
552
-                    $chunks = (int)($payload / 10);
553
-                    $remain = $payload - $chunks * 10;
554
-                    $size = $chunks * 3;
555
-                    if($remain >= 7) {
556
-                        $size += 2;
557
-                    } else if($remain >= 4) {
558
-                        $size += 1;
559
-                    }
560
-                    break;
561
-                case QR_MODE_AN:
562
-                    $chunks = (int)($payload / 11);
563
-                    $remain = $payload - $chunks * 11;
564
-                    $size = $chunks * 2;
565
-                    if($remain >= 6) 
566
-                        $size++;
567
-                    break;
568
-                case QR_MODE_8:
569
-                    $size = (int)($payload / 8);
570
-                    break;
571
-                case QR_MODE_KANJI:
572
-                    $size = (int)(($payload / 13) * 2);
573
-                    break;
574
-                case QR_MODE_STRUCTURE:
575
-                    $size = (int)($payload / 8);
576
-                    break;
577
-                default:
578
-                    $size = 0;
579
-                    break;
551
+            case QR_MODE_NUM:
552
+                $chunks = (int)($payload / 10);
553
+                $remain = $payload - $chunks * 10;
554
+                $size = $chunks * 3;
555
+                if($remain >= 7) {
556
+                    $size += 2;
557
+                } else if($remain >= 4) {
558
+                    $size += 1;
559
+                }
560
+                break;
561
+            case QR_MODE_AN:
562
+                $chunks = (int)($payload / 11);
563
+                $remain = $payload - $chunks * 11;
564
+                $size = $chunks * 2;
565
+                if($remain >= 6) 
566
+                    $size++;
567
+                break;
568
+            case QR_MODE_8:
569
+                $size = (int)($payload / 8);
570
+                break;
571
+            case QR_MODE_KANJI:
572
+                $size = (int)(($payload / 13) * 2);
573
+                break;
574
+            case QR_MODE_STRUCTURE:
575
+                $size = (int)($payload / 8);
576
+                break;
577
+            default:
578
+                $size = 0;
579
+                break;
580 580
             }
581 581
             
582 582
             $maxsize = QRspec::maximumWords($mode, $version);
Please login to merge, or discard this patch.
Spacing   +98 added lines, -98 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
26 26
  */
27 27
  
28
-    define('STRUCTURE_HEADER_BITS',  20);
28
+    define('STRUCTURE_HEADER_BITS', 20);
29 29
     define('MAX_STRUCTURED_SYMBOLS', 16);
30 30
 
31 31
     class QRinputItem {
@@ -40,11 +40,11 @@  discard block
 block discarded – undo
40 40
             $setData = array_slice($data, 0, $size);
41 41
             
42 42
             if (count($setData) < $size) {
43
-                $setData = array_merge($setData, array_fill(0,$size-count($setData),0));
43
+                $setData = array_merge($setData, array_fill(0, $size - count($setData), 0));
44 44
             }
45 45
         
46
-            if(!QRinput::check($mode, $size, $setData)) {
47
-                throw new Exception('Error m:'.$mode.',s:'.$size.',d:'.join(',',$setData));
46
+            if (!QRinput::check($mode, $size, $setData)) {
47
+                throw new Exception('Error m:'.$mode.',s:'.$size.',d:'.join(',', $setData));
48 48
                 return null;
49 49
             }
50 50
             
@@ -59,26 +59,26 @@  discard block
 block discarded – undo
59 59
         {
60 60
             try {
61 61
             
62
-                $words = (int)($this->size / 3);
62
+                $words = (int) ($this->size / 3);
63 63
                 $bs = new QRbitstream();
64 64
                 
65 65
                 $val = 0x1;
66 66
                 $bs->appendNum(4, $val);
67 67
                 $bs->appendNum(QRspec::lengthIndicator(QR_MODE_NUM, $version), $this->size);
68 68
 
69
-                for($i=0; $i<$words; $i++) {
70
-                    $val  = (ord($this->data[$i*3  ]) - ord('0')) * 100;
71
-                    $val += (ord($this->data[$i*3+1]) - ord('0')) * 10;
72
-                    $val += (ord($this->data[$i*3+2]) - ord('0'));
69
+                for ($i = 0; $i < $words; $i++) {
70
+                    $val  = (ord($this->data[$i * 3]) - ord('0')) * 100;
71
+                    $val += (ord($this->data[$i * 3 + 1]) - ord('0')) * 10;
72
+                    $val += (ord($this->data[$i * 3 + 2]) - ord('0'));
73 73
                     $bs->appendNum(10, $val);
74 74
                 }
75 75
 
76
-                if($this->size - $words * 3 == 1) {
77
-                    $val = ord($this->data[$words*3]) - ord('0');
76
+                if ($this->size - $words * 3 == 1) {
77
+                    $val = ord($this->data[$words * 3]) - ord('0');
78 78
                     $bs->appendNum(4, $val);
79
-                } else if($this->size - $words * 3 == 2) {
80
-                    $val  = (ord($this->data[$words*3  ]) - ord('0')) * 10;
81
-                    $val += (ord($this->data[$words*3+1]) - ord('0'));
79
+                } else if ($this->size - $words * 3 == 2) {
80
+                    $val  = (ord($this->data[$words * 3]) - ord('0')) * 10;
81
+                    $val += (ord($this->data[$words * 3 + 1]) - ord('0'));
82 82
                     $bs->appendNum(7, $val);
83 83
                 }
84 84
 
@@ -94,20 +94,20 @@  discard block
 block discarded – undo
94 94
         public function encodeModeAn($version)
95 95
         {
96 96
             try {
97
-                $words = (int)($this->size / 2);
97
+                $words = (int) ($this->size / 2);
98 98
                 $bs = new QRbitstream();
99 99
                 
100 100
                 $bs->appendNum(4, 0x02);
101 101
                 $bs->appendNum(QRspec::lengthIndicator(QR_MODE_AN, $version), $this->size);
102 102
 
103
-                for($i=0; $i<$words; $i++) {
104
-                    $val  = (int)QRinput::lookAnTable(ord($this->data[$i*2  ])) * 45;
105
-                    $val += (int)QRinput::lookAnTable(ord($this->data[$i*2+1]));
103
+                for ($i = 0; $i < $words; $i++) {
104
+                    $val  = (int) QRinput::lookAnTable(ord($this->data[$i * 2])) * 45;
105
+                    $val += (int) QRinput::lookAnTable(ord($this->data[$i * 2 + 1]));
106 106
 
107 107
                     $bs->appendNum(11, $val);
108 108
                 }
109 109
 
110
-                if($this->size & 1) {
110
+                if ($this->size & 1) {
111 111
                     $val = QRinput::lookAnTable(ord($this->data[$words * 2]));
112 112
                     $bs->appendNum(6, $val);
113 113
                 }
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
                 $bs->appendNum(4, 0x4);
130 130
                 $bs->appendNum(QRspec::lengthIndicator(QR_MODE_8, $version), $this->size);
131 131
 
132
-                for($i=0; $i<$this->size; $i++) {
132
+                for ($i = 0; $i < $this->size; $i++) {
133 133
                     $bs->appendNum(8, ord($this->data[$i]));
134 134
                 }
135 135
 
@@ -149,11 +149,11 @@  discard block
 block discarded – undo
149 149
                 $bs = new QRbitrtream();
150 150
                 
151 151
                 $bs->appendNum(4, 0x8);
152
-                $bs->appendNum(QRspec::lengthIndicator(QR_MODE_KANJI, $version), (int)($this->size / 2));
152
+                $bs->appendNum(QRspec::lengthIndicator(QR_MODE_KANJI, $version), (int) ($this->size / 2));
153 153
 
154
-                for($i=0; $i<$this->size; $i+=2) {
155
-                    $val = (ord($this->data[$i]) << 8) | ord($this->data[$i+1]);
156
-                    if($val <= 0x9ffc) {
154
+                for ($i = 0; $i < $this->size; $i += 2) {
155
+                    $val = (ord($this->data[$i]) << 8) | ord($this->data[$i + 1]);
156
+                    if ($val <= 0x9ffc) {
157 157
                         $val -= 0x8140;
158 158
                     } else {
159 159
                         $val -= 0xc140;
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
         public function encodeModeStructure()
178 178
         {
179 179
             try {
180
-                $bs =  new QRbitstream();
180
+                $bs = new QRbitstream();
181 181
                 
182 182
                 $bs->appendNum(4, 0x03);
183 183
                 $bs->appendNum(4, ord($this->data[1]) - 1);
@@ -197,14 +197,14 @@  discard block
 block discarded – undo
197 197
         {
198 198
             $bits = 0;
199 199
 
200
-            if($version == 0) 
200
+            if ($version == 0) 
201 201
                 $version = 1;
202 202
 
203
-            switch($this->mode) {
204
-                case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size);    break;
205
-                case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size);    break;
206
-                case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size);    break;
207
-                case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size);break;
203
+            switch ($this->mode) {
204
+                case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size); break;
205
+                case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size); break;
206
+                case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size); break;
207
+                case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size); break;
208 208
                 case QR_MODE_STRUCTURE:    return STRUCTURE_HEADER_BITS;            
209 209
                 default:
210 210
                     return 0;
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
 
213 213
             $l = QRspec::lengthIndicator($this->mode, $version);
214 214
             $m = 1 << $l;
215
-            $num = (int)(($this->size + $m - 1) / $m);
215
+            $num = (int) (($this->size + $m - 1) / $m);
216 216
 
217 217
             $bits += $num * (4 + $l);
218 218
 
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
                 unset($this->bstream);
228 228
                 $words = QRspec::maximumWords($this->mode, $version);
229 229
                 
230
-                if($this->size > $words) {
230
+                if ($this->size > $words) {
231 231
                 
232 232
                     $st1 = new QRinputItem($this->mode, $words, $this->data);
233 233
                     $st2 = new QRinputItem($this->mode, $this->size - $words, array_slice($this->data, $words));
@@ -246,18 +246,18 @@  discard block
 block discarded – undo
246 246
                     
247 247
                     $ret = 0;
248 248
                     
249
-                    switch($this->mode) {
250
-                        case QR_MODE_NUM:        $ret = $this->encodeModeNum($version);    break;
251
-                        case QR_MODE_AN:        $ret = $this->encodeModeAn($version);    break;
252
-                        case QR_MODE_8:            $ret = $this->encodeMode8($version);    break;
253
-                        case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version);break;
254
-                        case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure();    break;
249
+                    switch ($this->mode) {
250
+                        case QR_MODE_NUM:        $ret = $this->encodeModeNum($version); break;
251
+                        case QR_MODE_AN:        $ret = $this->encodeModeAn($version); break;
252
+                        case QR_MODE_8:            $ret = $this->encodeMode8($version); break;
253
+                        case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version); break;
254
+                        case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure(); break;
255 255
                         
256 256
                         default:
257 257
                             break;
258 258
                     }
259 259
                     
260
-                    if($ret < 0)
260
+                    if ($ret < 0)
261 261
                         return -1;
262 262
                 }
263 263
 
@@ -299,7 +299,7 @@  discard block
 block discarded – undo
299 299
         //----------------------------------------------------------------------
300 300
         public function setVersion($version)
301 301
         {
302
-            if($version < 0 || $version > QRSPEC_VERSION_MAX) {
302
+            if ($version < 0 || $version > QRSPEC_VERSION_MAX) {
303 303
                 throw new Exception('Invalid version no');
304 304
                 return -1;
305 305
             }
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
         //----------------------------------------------------------------------
319 319
         public function setErrorCorrectionLevel($level)
320 320
         {
321
-            if($level > QR_ECLEVEL_H) {
321
+            if ($level > QR_ECLEVEL_H) {
322 322
                 throw new Exception('Invalid ECLEVEL');
323 323
                 return -1;
324 324
             }
@@ -350,11 +350,11 @@  discard block
 block discarded – undo
350 350
         
351 351
         public function insertStructuredAppendHeader($size, $index, $parity)
352 352
         {
353
-            if( $size > MAX_STRUCTURED_SYMBOLS ) {
353
+            if ($size > MAX_STRUCTURED_SYMBOLS) {
354 354
                 throw new Exception('insertStructuredAppendHeader wrong size');
355 355
             }
356 356
             
357
-            if( $index <= 0 || $index > MAX_STRUCTURED_SYMBOLS ) {
357
+            if ($index <= 0 || $index > MAX_STRUCTURED_SYMBOLS) {
358 358
                 throw new Exception('insertStructuredAppendHeader wrong index');
359 359
             }
360 360
 
@@ -374,9 +374,9 @@  discard block
 block discarded – undo
374 374
         {
375 375
             $parity = 0;
376 376
             
377
-            foreach($this->items as $item) {
378
-                if($item->mode != QR_MODE_STRUCTURE) {
379
-                    for($i=$item->size-1; $i>=0; $i--) {
377
+            foreach ($this->items as $item) {
378
+                if ($item->mode != QR_MODE_STRUCTURE) {
379
+                    for ($i = $item->size - 1; $i >= 0; $i--) {
380 380
                         $parity ^= $item->data[$i];
381 381
                     }
382 382
                 }
@@ -388,8 +388,8 @@  discard block
 block discarded – undo
388 388
         //----------------------------------------------------------------------
389 389
         public static function checkModeNum($size, $data)
390 390
         {
391
-            for($i=0; $i<$size; $i++) {
392
-                if((ord($data[$i]) < ord('0')) || (ord($data[$i]) > ord('9'))){
391
+            for ($i = 0; $i < $size; $i++) {
392
+                if ((ord($data[$i]) < ord('0')) || (ord($data[$i]) > ord('9'))) {
393 393
                     return false;
394 394
                 }
395 395
             }
@@ -400,10 +400,10 @@  discard block
 block discarded – undo
400 400
         //----------------------------------------------------------------------
401 401
         public static function estimateBitsModeNum($size)
402 402
         {
403
-            $w = (int)$size / 3;
403
+            $w = (int) $size / 3;
404 404
             $bits = $w * 10;
405 405
             
406
-            switch($size - $w * 3) {
406
+            switch ($size - $w * 3) {
407 407
                 case 1:
408 408
                     $bits += 4;
409 409
                     break;
@@ -422,7 +422,7 @@  discard block
 block discarded – undo
422 422
             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
423 423
             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
424 424
             36, -1, -1, -1, 37, 38, -1, -1, -1, -1, 39, 40, -1, 41, 42, 43,
425
-             0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 44, -1, -1, -1, -1, -1,
425
+             0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 44, -1, -1, -1, -1, -1,
426 426
             -1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
427 427
             25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1,
428 428
             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -432,13 +432,13 @@  discard block
 block discarded – undo
432 432
         //----------------------------------------------------------------------
433 433
         public static function lookAnTable($c)
434 434
         {
435
-            return (($c > 127)?-1:self::$anTable[$c]);
435
+            return (($c > 127) ?-1 : self::$anTable[$c]);
436 436
         }
437 437
         
438 438
         //----------------------------------------------------------------------
439 439
         public static function checkModeAn($size, $data)
440 440
         {
441
-            for($i=0; $i<$size; $i++) {
441
+            for ($i = 0; $i < $size; $i++) {
442 442
                 if (self::lookAnTable(ord($data[$i])) == -1) {
443 443
                     return false;
444 444
                 }
@@ -450,10 +450,10 @@  discard block
 block discarded – undo
450 450
         //----------------------------------------------------------------------
451 451
         public static function estimateBitsModeAn($size)
452 452
         {
453
-            $w = (int)($size / 2);
453
+            $w = (int) ($size / 2);
454 454
             $bits = $w * 11;
455 455
             
456
-            if($size & 1) {
456
+            if ($size & 1) {
457 457
                 $bits += 6;
458 458
             }
459 459
 
@@ -469,18 +469,18 @@  discard block
 block discarded – undo
469 469
         //----------------------------------------------------------------------
470 470
         public function estimateBitsModeKanji($size)
471 471
         {
472
-            return (int)(($size / 2) * 13);
472
+            return (int) (($size / 2) * 13);
473 473
         }
474 474
         
475 475
         //----------------------------------------------------------------------
476 476
         public static function checkModeKanji($size, $data)
477 477
         {
478
-            if($size & 1)
478
+            if ($size & 1)
479 479
                 return false;
480 480
 
481
-            for($i=0; $i<$size; $i+=2) {
482
-                $val = (ord($data[$i]) << 8) | ord($data[$i+1]);
483
-                if( $val < 0x8140 
481
+            for ($i = 0; $i < $size; $i += 2) {
482
+                $val = (ord($data[$i]) << 8) | ord($data[$i + 1]);
483
+                if ($val < 0x8140 
484 484
                 || ($val > 0x9ffc && $val < 0xe040) 
485 485
                 || $val > 0xebbf) {
486 486
                     return false;
@@ -496,12 +496,12 @@  discard block
 block discarded – undo
496 496
 
497 497
         public static function check($mode, $size, $data)
498 498
         {
499
-            if($size <= 0) 
499
+            if ($size <= 0) 
500 500
                 return false;
501 501
 
502
-            switch($mode) {
503
-                case QR_MODE_NUM:       return self::checkModeNum($size, $data);   break;
504
-                case QR_MODE_AN:        return self::checkModeAn($size, $data);    break;
502
+            switch ($mode) {
503
+                case QR_MODE_NUM:       return self::checkModeNum($size, $data); break;
504
+                case QR_MODE_AN:        return self::checkModeAn($size, $data); break;
505 505
                 case QR_MODE_KANJI:     return self::checkModeKanji($size, $data); break;
506 506
                 case QR_MODE_8:         return true; break;
507 507
                 case QR_MODE_STRUCTURE: return true; break;
@@ -519,7 +519,7 @@  discard block
 block discarded – undo
519 519
         {
520 520
             $bits = 0;
521 521
 
522
-            foreach($this->items as $item) {
522
+            foreach ($this->items as $item) {
523 523
                 $bits += $item->estimateBitStreamSizeOfEntry($version);
524 524
             }
525 525
 
@@ -534,7 +534,7 @@  discard block
 block discarded – undo
534 534
             do {
535 535
                 $prev = $version;
536 536
                 $bits = $this->estimateBitStreamSize($prev);
537
-                $version = QRspec::getMinimumVersion((int)(($bits + 7) / 8), $this->level);
537
+                $version = QRspec::getMinimumVersion((int) (($bits + 7) / 8), $this->level);
538 538
                 if ($version < 0) {
539 539
                     return -1;
540 540
                 }
@@ -547,32 +547,32 @@  discard block
 block discarded – undo
547 547
         public static function lengthOfCode($mode, $version, $bits)
548 548
         {
549 549
             $payload = $bits - 4 - QRspec::lengthIndicator($mode, $version);
550
-            switch($mode) {
550
+            switch ($mode) {
551 551
                 case QR_MODE_NUM:
552
-                    $chunks = (int)($payload / 10);
552
+                    $chunks = (int) ($payload / 10);
553 553
                     $remain = $payload - $chunks * 10;
554 554
                     $size = $chunks * 3;
555
-                    if($remain >= 7) {
555
+                    if ($remain >= 7) {
556 556
                         $size += 2;
557
-                    } else if($remain >= 4) {
557
+                    } else if ($remain >= 4) {
558 558
                         $size += 1;
559 559
                     }
560 560
                     break;
561 561
                 case QR_MODE_AN:
562
-                    $chunks = (int)($payload / 11);
562
+                    $chunks = (int) ($payload / 11);
563 563
                     $remain = $payload - $chunks * 11;
564 564
                     $size = $chunks * 2;
565
-                    if($remain >= 6) 
565
+                    if ($remain >= 6) 
566 566
                         $size++;
567 567
                     break;
568 568
                 case QR_MODE_8:
569
-                    $size = (int)($payload / 8);
569
+                    $size = (int) ($payload / 8);
570 570
                     break;
571 571
                 case QR_MODE_KANJI:
572
-                    $size = (int)(($payload / 13) * 2);
572
+                    $size = (int) (($payload / 13) * 2);
573 573
                     break;
574 574
                 case QR_MODE_STRUCTURE:
575
-                    $size = (int)($payload / 8);
575
+                    $size = (int) ($payload / 8);
576 576
                     break;
577 577
                 default:
578 578
                     $size = 0;
@@ -580,8 +580,8 @@  discard block
 block discarded – undo
580 580
             }
581 581
             
582 582
             $maxsize = QRspec::maximumWords($mode, $version);
583
-            if($size < 0) $size = 0;
584
-            if($size > $maxsize) $size = $maxsize;
583
+            if ($size < 0) $size = 0;
584
+            if ($size > $maxsize) $size = $maxsize;
585 585
 
586 586
             return $size;
587 587
         }
@@ -591,10 +591,10 @@  discard block
 block discarded – undo
591 591
         {
592 592
             $total = 0;
593 593
 
594
-            foreach($this->items as $item) {
594
+            foreach ($this->items as $item) {
595 595
                 $bits = $item->encodeBitStream($this->version);
596 596
                 
597
-                if($bits < 0) 
597
+                if ($bits < 0) 
598 598
                     return -1;
599 599
                     
600 600
                 $total += $bits;
@@ -607,21 +607,21 @@  discard block
 block discarded – undo
607 607
         public function convertData()
608 608
         {
609 609
             $ver = $this->estimateVersion();
610
-            if($ver > $this->getVersion()) {
610
+            if ($ver > $this->getVersion()) {
611 611
                 $this->setVersion($ver);
612 612
             }
613 613
 
614
-            for(;;) {
614
+            for (;;) {
615 615
                 $bits = $this->createBitStream();
616 616
                 
617
-                if($bits < 0) 
617
+                if ($bits < 0) 
618 618
                     return -1;
619 619
                     
620
-                $ver = QRspec::getMinimumVersion((int)(($bits + 7) / 8), $this->level);
621
-                if($ver < 0) {
620
+                $ver = QRspec::getMinimumVersion((int) (($bits + 7) / 8), $this->level);
621
+                if ($ver < 0) {
622 622
                     throw new Exception('WRONG VERSION');
623 623
                     return -1;
624
-                } else if($ver > $this->getVersion()) {
624
+                } else if ($ver > $this->getVersion()) {
625 625
                     $this->setVersion($ver);
626 626
                 } else {
627 627
                     break;
@@ -647,26 +647,26 @@  discard block
 block discarded – undo
647 647
             }
648 648
 
649 649
             $bits += 4;
650
-            $words = (int)(($bits + 7) / 8);
650
+            $words = (int) (($bits + 7) / 8);
651 651
 
652 652
             $padding = new QRbitstream();
653 653
             $ret = $padding->appendNum($words * 8 - $bits + 4, 0);
654 654
             
655
-            if($ret < 0) 
655
+            if ($ret < 0) 
656 656
                 return $ret;
657 657
 
658 658
             $padlen = $maxwords - $words;
659 659
             
660
-            if($padlen > 0) {
660
+            if ($padlen > 0) {
661 661
                 
662 662
                 $padbuf = array();
663
-                for($i=0; $i<$padlen; $i++) {
664
-                    $padbuf[$i] = ($i&1)?0x11:0xec;
663
+                for ($i = 0; $i < $padlen; $i++) {
664
+                    $padbuf[$i] = ($i & 1) ? 0x11 : 0xec;
665 665
                 }
666 666
                 
667 667
                 $ret = $padding->appendBytes($padlen, $padbuf);
668 668
                 
669
-                if($ret < 0)
669
+                if ($ret < 0)
670 670
                     return $ret;
671 671
                 
672 672
             }
@@ -679,15 +679,15 @@  discard block
 block discarded – undo
679 679
         //----------------------------------------------------------------------
680 680
         public function mergeBitStream()
681 681
         {
682
-            if($this->convertData() < 0) {
682
+            if ($this->convertData() < 0) {
683 683
                 return null;
684 684
             }
685 685
 
686 686
             $bstream = new QRbitstream();
687 687
             
688
-            foreach($this->items as $item) {
688
+            foreach ($this->items as $item) {
689 689
                 $ret = $bstream->append($item->bstream);
690
-                if($ret < 0) {
690
+                if ($ret < 0) {
691 691
                     return null;
692 692
                 }
693 693
             }
@@ -701,12 +701,12 @@  discard block
 block discarded – undo
701 701
 
702 702
             $bstream = $this->mergeBitStream();
703 703
             
704
-            if($bstream == null) {
704
+            if ($bstream == null) {
705 705
                 return null;
706 706
             }
707 707
             
708 708
             $ret = $this->appendPaddingBit($bstream);
709
-            if($ret < 0) {
709
+            if ($ret < 0) {
710 710
                 return null;
711 711
             }
712 712
 
@@ -717,7 +717,7 @@  discard block
 block discarded – undo
717 717
         public function getByteStream()
718 718
         {
719 719
             $bstream = $this->getBitStream();
720
-            if($bstream == null) {
720
+            if ($bstream == null) {
721 721
                 return null;
722 722
             }
723 723
             
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -422,7 +422,7 @@
 block discarded – undo
422 422
             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
423 423
             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
424 424
             36, -1, -1, -1, 37, 38, -1, -1, -1, -1, 39, 40, -1, 41, 42, 43,
425
-             0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 44, -1, -1, -1, -1, -1,
425
+                0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 44, -1, -1, -1, -1, -1,
426 426
             -1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
427 427
             25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1,
428 428
             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
Please login to merge, or discard this patch.
Braces   +33 added lines, -20 removed lines patch added patch discarded remove patch
@@ -197,8 +197,9 @@  discard block
 block discarded – undo
197 197
         {
198 198
             $bits = 0;
199 199
 
200
-            if($version == 0) 
201
-                $version = 1;
200
+            if($version == 0) {
201
+                            $version = 1;
202
+            }
202 203
 
203 204
             switch($this->mode) {
204 205
                 case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size);    break;
@@ -257,8 +258,9 @@  discard block
 block discarded – undo
257 258
                             break;
258 259
                     }
259 260
                     
260
-                    if($ret < 0)
261
-                        return -1;
261
+                    if($ret < 0) {
262
+                                            return -1;
263
+                    }
262 264
                 }
263 265
 
264 266
                 return $this->bstream->size();
@@ -475,8 +477,9 @@  discard block
 block discarded – undo
475 477
         //----------------------------------------------------------------------
476 478
         public static function checkModeKanji($size, $data)
477 479
         {
478
-            if($size & 1)
479
-                return false;
480
+            if($size & 1) {
481
+                            return false;
482
+            }
480 483
 
481 484
             for($i=0; $i<$size; $i+=2) {
482 485
                 $val = (ord($data[$i]) << 8) | ord($data[$i+1]);
@@ -496,8 +499,9 @@  discard block
 block discarded – undo
496 499
 
497 500
         public static function check($mode, $size, $data)
498 501
         {
499
-            if($size <= 0) 
500
-                return false;
502
+            if($size <= 0) {
503
+                            return false;
504
+            }
501 505
 
502 506
             switch($mode) {
503 507
                 case QR_MODE_NUM:       return self::checkModeNum($size, $data);   break;
@@ -562,8 +566,9 @@  discard block
 block discarded – undo
562 566
                     $chunks = (int)($payload / 11);
563 567
                     $remain = $payload - $chunks * 11;
564 568
                     $size = $chunks * 2;
565
-                    if($remain >= 6) 
566
-                        $size++;
569
+                    if($remain >= 6) {
570
+                                            $size++;
571
+                    }
567 572
                     break;
568 573
                 case QR_MODE_8:
569 574
                     $size = (int)($payload / 8);
@@ -580,8 +585,12 @@  discard block
 block discarded – undo
580 585
             }
581 586
             
582 587
             $maxsize = QRspec::maximumWords($mode, $version);
583
-            if($size < 0) $size = 0;
584
-            if($size > $maxsize) $size = $maxsize;
588
+            if($size < 0) {
589
+                $size = 0;
590
+            }
591
+            if($size > $maxsize) {
592
+                $size = $maxsize;
593
+            }
585 594
 
586 595
             return $size;
587 596
         }
@@ -594,8 +603,9 @@  discard block
 block discarded – undo
594 603
             foreach($this->items as $item) {
595 604
                 $bits = $item->encodeBitStream($this->version);
596 605
                 
597
-                if($bits < 0) 
598
-                    return -1;
606
+                if($bits < 0) {
607
+                                    return -1;
608
+                }
599 609
                     
600 610
                 $total += $bits;
601 611
             }
@@ -614,8 +624,9 @@  discard block
 block discarded – undo
614 624
             for(;;) {
615 625
                 $bits = $this->createBitStream();
616 626
                 
617
-                if($bits < 0) 
618
-                    return -1;
627
+                if($bits < 0) {
628
+                                    return -1;
629
+                }
619 630
                     
620 631
                 $ver = QRspec::getMinimumVersion((int)(($bits + 7) / 8), $this->level);
621 632
                 if($ver < 0) {
@@ -652,8 +663,9 @@  discard block
 block discarded – undo
652 663
             $padding = new QRbitstream();
653 664
             $ret = $padding->appendNum($words * 8 - $bits + 4, 0);
654 665
             
655
-            if($ret < 0) 
656
-                return $ret;
666
+            if($ret < 0) {
667
+                            return $ret;
668
+            }
657 669
 
658 670
             $padlen = $maxwords - $words;
659 671
             
@@ -666,8 +678,9 @@  discard block
 block discarded – undo
666 678
                 
667 679
                 $ret = $padding->appendBytes($padlen, $padbuf);
668 680
                 
669
-                if($ret < 0)
670
-                    return $ret;
681
+                if($ret < 0) {
682
+                                    return $ret;
683
+                }
671 684
                 
672 685
             }
673 686
 
Please login to merge, or discard this patch.