codysnider / tt-rss

lib/MiniTemplator.class.php

Indentation +229 added lines, -229 removed lines

@@ -93,56 +93,56 @@ 
 var $maxInclTemplateSize = 1000000;   // maximum length of template string when including subtemplates

 var $template;                        // Template file data

 var $varTab;                          // variables table, array index is variable no

-    // Fields:

-    //  varName                       // variable name

-    //  varValue                      // variable value

+	// Fields:

+	//  varName                       // variable name

+	//  varValue                      // variable value

 var $varTabCnt;                       // no of entries used in VarTab

 var $varNameToNoMap;                  // maps variable names to variable numbers

 var $varRefTab;                       // variable references table

-    // Contains an entry for each variable reference in the template. Ordered by TemplatePos.

-    // Fields:

-    //  varNo                         // variable no

-    //  tPosBegin                     // template position of begin of variable reference

-    //  tPosEnd                       // template position of end of variable reference

-    //  blockNo                       // block no of the (innermost) block that contains this variable reference

-    //  blockVarNo                    // block variable no. Index into BlockInstTab.BlockVarTab

+	// Contains an entry for each variable reference in the template. Ordered by TemplatePos.

+	// Fields:

+	//  varNo                         // variable no

+	//  tPosBegin                     // template position of begin of variable reference

+	//  tPosEnd                       // template position of end of variable reference

+	//  blockNo                       // block no of the (innermost) block that contains this variable reference

+	//  blockVarNo                    // block variable no. Index into BlockInstTab.BlockVarTab

 var $varRefTabCnt;                    // no of entries used in VarRefTab

 var $blockTab;                        // Blocks table, array index is block no

-    // Contains an entry for each block in the template. Ordered by TPosBegin.

-    // Fields:

-    //  blockName                     // block name

-    //  nextWithSameName;             // block no of next block with same name or -1 (blocks are backward linked in relation to template position)

-    //  tPosBegin                     // template position of begin of block

-    //  tPosContentsBegin             // template pos of begin of block contents

-    //  tPosContentsEnd               // template pos of end of block contents

-    //  tPosEnd                       // template position of end of block

-    //  nestingLevel                  // block nesting level

-    //  parentBlockNo                 // block no of parent block

-    //  definitionIsOpen              // true while $BeginBlock processed but no $EndBlock

-    //  instances                     // number of instances of this block

-    //  firstBlockInstNo              // block instance no of first instance of this block or -1

-    //  lastBlockInstNo               // block instance no of last instance of this block or -1

-    //  currBlockInstNo               // current block instance no, used during generation of output file

-    //  blockVarCnt                   // no of variables in block

-    //  blockVarNoToVarNoMap          // maps block variable numbers to variable numbers

-    //  firstVarRefNo                 // variable reference no of first variable of this block or -1

+	// Contains an entry for each block in the template. Ordered by TPosBegin.

+	// Fields:

+	//  blockName                     // block name

+	//  nextWithSameName;             // block no of next block with same name or -1 (blocks are backward linked in relation to template position)

+	//  tPosBegin                     // template position of begin of block

+	//  tPosContentsBegin             // template pos of begin of block contents

+	//  tPosContentsEnd               // template pos of end of block contents

+	//  tPosEnd                       // template position of end of block

+	//  nestingLevel                  // block nesting level

+	//  parentBlockNo                 // block no of parent block

+	//  definitionIsOpen              // true while $BeginBlock processed but no $EndBlock

+	//  instances                     // number of instances of this block

+	//  firstBlockInstNo              // block instance no of first instance of this block or -1

+	//  lastBlockInstNo               // block instance no of last instance of this block or -1

+	//  currBlockInstNo               // current block instance no, used during generation of output file

+	//  blockVarCnt                   // no of variables in block

+	//  blockVarNoToVarNoMap          // maps block variable numbers to variable numbers

+	//  firstVarRefNo                 // variable reference no of first variable of this block or -1

 var $blockTabCnt;                     // no of entries used in BlockTab

 var $blockNameToNoMap;                // maps block names to block numbers

 var $openBlocksTab;

-    // During parsing, this table contains the block numbers of the open parent blocks (nested outer blocks).

-    // Indexed by the block nesting level.

+	// During parsing, this table contains the block numbers of the open parent blocks (nested outer blocks).

+	// Indexed by the block nesting level.

 var $blockInstTab;                    // block instances table

-    // This table contains an entry for each block instance that has been added.

-    // Indexed by BlockInstNo.

-    // Fields:

-    //  blockNo                       // block number

-    //  instanceLevel                 // instance level of this block

-    //     InstanceLevel is an instance counter per block.

-    //     (In contrast to blockInstNo, which is an instance counter over the instances of all blocks)

-    //  parentInstLevel               // instance level of parent block

-    //  nextBlockInstNo               // pointer to next instance of this block or -1

-    //     Forward chain for instances of same block.

-    //  blockVarTab                   // block instance variables

+	// This table contains an entry for each block instance that has been added.

+	// Indexed by BlockInstNo.

+	// Fields:

+	//  blockNo                       // block number

+	//  instanceLevel                 // instance level of this block

+	//     InstanceLevel is an instance counter per block.

+	//     (In contrast to blockInstNo, which is an instance counter over the instances of all blocks)

+	//  parentInstLevel               // instance level of parent block

+	//  nextBlockInstNo               // pointer to next instance of this block or -1

+	//     Forward chain for instances of same block.

+	//  blockVarTab                   // block instance variables

 var $blockInstTabCnt;                 // no of entries used in BlockInstTab

 

 var $currentNestingLevel;             // Current block nesting level during parsing.

@@ -173,8 +173,8 @@ 
 */

 function readTemplateFromFile ($fileName) {

    if (!$this->readFileIntoString($fileName,$s)) {

-      $this->triggerError ("Error while reading template file " . $fileName . ".");

-      return false; }

+	  $this->triggerError ("Error while reading template file " . $fileName . ".");

+	  return false; }

    if (!$this->setTemplateString($s)) return false;

    return true; }

 

@@ -200,8 +200,8 @@ 
 function loadSubtemplate ($subtemplateName, &$s) {

    $subtemplateFileName = $this->combineFileSystemPath($this->subtemplateBasePath,$subtemplateName);

    if (!$this->readFileIntoString($subtemplateFileName,$s)) {

-      $this->triggerError ("Error while reading subtemplate file " . $subtemplateFileName . ".");

-      return false; }

+	  $this->triggerError ("Error while reading subtemplate file " . $subtemplateFileName . ".");

+	  return false; }

    return true; }

 

 //--- template parsing ----------------------------------------------------------------------------------------------

@@ -271,17 +271,17 @@ 
 function parseTemplateCommands() {

    $p = 0;

    while (true) {

-      $p0 = strpos($this->template,'<!--',$p);

-      if ($p0 === false) break;

-      $p = strpos($this->template,'-->',$p0);

-      if ($p === false) {

-         $this->triggerError ("Invalid HTML comment in template at offset $p0.");

-         return false; }

-      $p += 3;

-      $cmdL = substr($this->template,$p0+4,$p-$p0-7);

-      if (!$this->processTemplateCommand($cmdL,$p0,$p,$resumeFromStart))

-         return false;

-      if ($resumeFromStart) $p = $p0; }

+	  $p0 = strpos($this->template,'<!--',$p);

+	  if ($p0 === false) break;

+	  $p = strpos($this->template,'-->',$p0);

+	  if ($p === false) {

+		 $this->triggerError ("Invalid HTML comment in template at offset $p0.");

+		 return false; }

+	  $p += 3;

+	  $cmdL = substr($this->template,$p0+4,$p-$p0-7);

+	  if (!$this->processTemplateCommand($cmdL,$p0,$p,$resumeFromStart))

+		 return false;

+	  if ($resumeFromStart) $p = $p0; }

    return true; }

 

 /**

@@ -295,24 +295,24 @@ 
    if (!$this->parseWord($cmdL,$p,$cmd)) return true;

    $parms = substr($cmdL,$p);

    switch (strtoupper($cmd)) {

-      case '$BEGINBLOCK':

-         if (!$this->processBeginBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd))

-            return false;

-         break;

-      case '$ENDBLOCK':

-         if (!$this->processEndBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd))

-            return false;

-         break;

-      case '$INCLUDE':

-         if (!$this->processincludeCmd($parms,$cmdTPosBegin,$cmdTPosEnd))

-            return false;

-         $resumeFromStart = true;

-         break;

-      default:

-         if ($cmd{0} == '$' && !(strlen($cmd) >= 2 && $cmd{1} == '{')) {

-            $this->triggerError ("Unknown command \"$cmd\" in template at offset $cmdTPosBegin.");

-            return false; }}

-    return true; }

+	  case '$BEGINBLOCK':

+		 if (!$this->processBeginBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd))

+			return false;

+		 break;

+	  case '$ENDBLOCK':

+		 if (!$this->processEndBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd))

+			return false;

+		 break;

+	  case '$INCLUDE':

+		 if (!$this->processincludeCmd($parms,$cmdTPosBegin,$cmdTPosEnd))

+			return false;

+		 $resumeFromStart = true;

+		 break;

+	  default:

+		 if ($cmd{0} == '$' && !(strlen($cmd) >= 2 && $cmd{1} == '{')) {

+			$this->triggerError ("Unknown command \"$cmd\" in template at offset $cmdTPosBegin.");

+			return false; }}

+	return true; }

 

 /**

 * Processes the $BeginBlock command.

@@ -322,11 +322,11 @@ 
 function processBeginBlockCmd ($parms, $cmdTPosBegin, $cmdTPosEnd) {

    $p = 0;

    if (!$this->parseWord($parms,$p,$blockName)) {

-      $this->triggerError ("Missing block name in \$BeginBlock command in template at offset $cmdTPosBegin.");

-      return false; }

+	  $this->triggerError ("Missing block name in \$BeginBlock command in template at offset $cmdTPosBegin.");

+	  return false; }

    if (trim(substr($parms,$p)) != '') {

-      $this->triggerError ("Extra parameter in \$BeginBlock command in template at offset $cmdTPosBegin.");

-      return false; }

+	  $this->triggerError ("Extra parameter in \$BeginBlock command in template at offset $cmdTPosBegin.");

+	  return false; }

    $this->registerBlock ($blockName, $blockNo);

    $btr =& $this->blockTab[$blockNo];

    $btr['tPosBegin'] = $cmdTPosBegin;

@@ -336,8 +336,8 @@ 
    $this->openBlocksTab[$this->currentNestingLevel] = $blockNo;

    $this->currentNestingLevel += 1;

    if ($this->currentNestingLevel > $this->maxNestingLevel) {

-      $this->triggerError ("Block nesting overflow in template at offset $cmdTPosBegin.");

-      return false; }

+	  $this->triggerError ("Block nesting overflow in template at offset $cmdTPosBegin.");

+	  return false; }

    return true; }

 

 /**

@@ -348,22 +348,22 @@ 
 function processEndBlockCmd ($parms, $cmdTPosBegin, $cmdTPosEnd) {

    $p = 0;

    if (!$this->parseWord($parms,$p,$blockName)) {

-      $this->triggerError ("Missing block name in \$EndBlock command in template at offset $cmdTPosBegin.");

-      return false; }

+	  $this->triggerError ("Missing block name in \$EndBlock command in template at offset $cmdTPosBegin.");

+	  return false; }

    if (trim(substr($parms,$p)) != '') {

-      $this->triggerError ("Extra parameter in \$EndBlock command in template at offset $cmdTPosBegin.");

-      return false; }

+	  $this->triggerError ("Extra parameter in \$EndBlock command in template at offset $cmdTPosBegin.");

+	  return false; }

    if (!$this->lookupBlockName($blockName,$blockNo)) {

-      $this->triggerError ("Undefined block name \"$blockName\" in \$EndBlock command in template at offset $cmdTPosBegin.");

-      return false; }

+	  $this->triggerError ("Undefined block name \"$blockName\" in \$EndBlock command in template at offset $cmdTPosBegin.");

+	  return false; }

    $this->currentNestingLevel -= 1;

    $btr =& $this->blockTab[$blockNo];

    if (!$btr['definitionIsOpen']) {

-      $this->triggerError ("Multiple \$EndBlock command for block \"$blockName\" in template at offset $cmdTPosBegin.");

-      return false; }

+	  $this->triggerError ("Multiple \$EndBlock command for block \"$blockName\" in template at offset $cmdTPosBegin.");

+	  return false; }

    if ($btr['nestingLevel'] != $this->currentNestingLevel) {

-      $this->triggerError ("Block nesting level mismatch at \$EndBlock command for block \"$blockName\" in template at offset $cmdTPosBegin.");

-      return false; }

+	  $this->triggerError ("Block nesting level mismatch at \$EndBlock command for block \"$blockName\" in template at offset $cmdTPosBegin.");

+	  return false; }

    $btr['tPosContentsEnd'] = $cmdTPosBegin;

    $btr['tPosEnd'] = $cmdTPosEnd;

    $btr['definitionIsOpen'] = false;

@@ -378,7 +378,7 @@ 
    $btr = array();

    $btr['blockName'] = $blockName;

    if (!$this->lookupBlockName($blockName,$btr['nextWithSameName']))

-      $btr['nextWithSameName'] = -1;

+	  $btr['nextWithSameName'] = -1;

    $btr['definitionIsOpen'] = true;

    $btr['instances'] = 0;

    $btr['firstBlockInstNo'] = -1;

@@ -395,13 +395,13 @@ 
 */

 function checkBlockDefinitionsComplete() {

    for ($blockNo=0; $blockNo < $this->blockTabCnt; $blockNo++) {

-      $btr =& $this->blockTab[$blockNo];

-      if ($btr['definitionIsOpen']) {

-         $this->triggerError ("Missing \$EndBlock command in template for block " . $btr['blockName'] . ".");

-         return false; }}

+	  $btr =& $this->blockTab[$blockNo];

+	  if ($btr['definitionIsOpen']) {

+		 $this->triggerError ("Missing \$EndBlock command in template for block " . $btr['blockName'] . ".");

+		 return false; }}

    if ($this->currentNestingLevel != 0) {

-      $this->triggerError ("Block nesting level error at end of template.");

-      return false; }

+	  $this->triggerError ("Block nesting level error at end of template.");

+	  return false; }

    return true; }

 

 /**

@@ -412,11 +412,11 @@ 
 function processIncludeCmd ($parms, $cmdTPosBegin, $cmdTPosEnd) {

    $p = 0;

    if (!$this->parseWordOrQuotedString($parms,$p,$subtemplateName)) {

-      $this->triggerError ("Missing or invalid subtemplate name in \$Include command in template at offset $cmdTPosBegin.");

-      return false; }

+	  $this->triggerError ("Missing or invalid subtemplate name in \$Include command in template at offset $cmdTPosBegin.");

+	  return false; }

    if (trim(substr($parms,$p)) != '') {

-      $this->triggerError ("Extra parameter in \$include command in template at offset $cmdTPosBegin.");

-      return false; }

+	  $this->triggerError ("Extra parameter in \$include command in template at offset $cmdTPosBegin.");

+	  return false; }

    return $this->insertSubtemplate($subtemplateName,$cmdTPosBegin,$cmdTPosEnd); }

 

 /**

@@ -426,8 +426,8 @@ 
 */

 function insertSubtemplate ($subtemplateName, $tPos1, $tPos2) {

    if (strlen($this->template) > $this->maxInclTemplateSize) {

-      $this->triggerError ("Subtemplate include aborted because the internal template string is longer than $this->maxInclTemplateSize characters.");

-      return false; }

+	  $this->triggerError ("Subtemplate include aborted because the internal template string is longer than $this->maxInclTemplateSize characters.");

+	  return false; }

    if (!$this->loadSubtemplate($subtemplateName,$subtemplate)) return false;

    // (Copying the template to insert a subtemplate is a bit slow. In a future implementation of MiniTemplator,

    // a table could be used that contains references to the string fragments.)

@@ -442,19 +442,19 @@ 
 function parseTemplateVariables() {

    $p = 0;

    while (true) {

-      $p = strpos($this->template, '${', $p);

-      if ($p === false) break;

-      $p0 = $p;

-      $p = strpos($this->template, '}', $p);

-      if ($p === false) {

-         $this->triggerError ("Invalid variable reference in template at offset $p0.");

-         return false; }

-      $p += 1;

-      $varName = trim(substr($this->template, $p0+2, $p-$p0-3));

-      if (strlen($varName) == 0) {

-         $this->triggerError ("Empty variable name in template at offset $p0.");

-         return false; }

-      $this->registerVariableReference ($varName, $p0, $p); }

+	  $p = strpos($this->template, '${', $p);

+	  if ($p === false) break;

+	  $p0 = $p;

+	  $p = strpos($this->template, '}', $p);

+	  if ($p === false) {

+		 $this->triggerError ("Invalid variable reference in template at offset $p0.");

+		 return false; }

+	  $p += 1;

+	  $varName = trim(substr($this->template, $p0+2, $p-$p0-3));

+	  if (strlen($varName) == 0) {

+		 $this->triggerError ("Empty variable name in template at offset $p0.");

+		 return false; }

+	  $this->registerVariableReference ($varName, $p0, $p); }

    return true; }

 

 /**

@@ -462,7 +462,7 @@ 
 */

 function registerVariableReference ($varName, $tPosBegin, $tPosEnd) {

    if (!$this->lookupVariableName($varName,$varNo))

-      $this->registerVariable($varName,$varNo);

+	  $this->registerVariable($varName,$varNo);

    $varRefNo = $this->varRefTabCnt++;

    $vrtr =& $this->varRefTab[$varRefNo];

    $vrtr = array();

@@ -490,27 +490,27 @@ 
    $activeBlockNo = 0;

    $nextBlockNo = 1;

    while ($varRefNo < $this->varRefTabCnt) {

-      $vrtr =& $this->varRefTab[$varRefNo];

-      $varRefTPos = $vrtr['tPosBegin'];

-      $varNo = $vrtr['varNo'];

-      if ($varRefTPos >= $this->blockTab[$activeBlockNo]['tPosEnd']) {

-         $activeBlockNo = $this->blockTab[$activeBlockNo]['parentBlockNo'];

-         continue; }

-      if ($nextBlockNo < $this->blockTabCnt) {

-         if ($varRefTPos >= $this->blockTab[$nextBlockNo]['tPosBegin']) {

-            $activeBlockNo = $nextBlockNo;

-            $nextBlockNo += 1;

-            continue; }}

-      $btr =& $this->blockTab[$activeBlockNo];

-      if ($varRefTPos < $btr['tPosBegin'])

-         $this->programLogicError(1);

-      $blockVarNo = $btr['blockVarCnt']++;

-      $btr['blockVarNoToVarNoMap'][$blockVarNo] = $varNo;

-      if ($btr['firstVarRefNo'] == -1)

-         $btr['firstVarRefNo'] = $varRefNo;

-      $vrtr['blockNo'] = $activeBlockNo;

-      $vrtr['blockVarNo'] = $blockVarNo;

-      $varRefNo += 1; }}

+	  $vrtr =& $this->varRefTab[$varRefNo];

+	  $varRefTPos = $vrtr['tPosBegin'];

+	  $varNo = $vrtr['varNo'];

+	  if ($varRefTPos >= $this->blockTab[$activeBlockNo]['tPosEnd']) {

+		 $activeBlockNo = $this->blockTab[$activeBlockNo]['parentBlockNo'];

+		 continue; }

+	  if ($nextBlockNo < $this->blockTabCnt) {

+		 if ($varRefTPos >= $this->blockTab[$nextBlockNo]['tPosBegin']) {

+			$activeBlockNo = $nextBlockNo;

+			$nextBlockNo += 1;

+			continue; }}

+	  $btr =& $this->blockTab[$activeBlockNo];

+	  if ($varRefTPos < $btr['tPosBegin'])

+		 $this->programLogicError(1);

+	  $blockVarNo = $btr['blockVarCnt']++;

+	  $btr['blockVarNoToVarNoMap'][$blockVarNo] = $varNo;

+	  if ($btr['firstVarRefNo'] == -1)

+		 $btr['firstVarRefNo'] = $varRefNo;

+	  $vrtr['blockNo'] = $activeBlockNo;

+	  $vrtr['blockVarNo'] = $blockVarNo;

+	  $varRefNo += 1; }}

 

 //--- build up (template variables and blocks) ----------------------------------------------------------------------

 

@@ -524,12 +524,12 @@ 
 */

 function reset() {

    for ($varNo=0; $varNo<$this->varTabCnt; $varNo++)

-      $this->varTab[$varNo]['varValue'] = '';

+	  $this->varTab[$varNo]['varValue'] = '';

    for ($blockNo=0; $blockNo<$this->blockTabCnt; $blockNo++) {

-      $btr =& $this->blockTab[$blockNo];

-      $btr['instances'] = 0;

-      $btr['firstBlockInstNo'] = -1;

-      $btr['lastBlockInstNo'] = -1; }

+	  $btr =& $this->blockTab[$blockNo];

+	  $btr['instances'] = 0;

+	  $btr['firstBlockInstNo'] = -1;

+	  $btr['lastBlockInstNo'] = -1; }

    $this->blockInstTab = array();

    $this->blockInstTabCnt = 0; }

 

@@ -551,9 +551,9 @@ 
 function setVariable ($variableName, $variableValue, $isOptional=false) {

    if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }

    if (!$this->lookupVariableName($variableName,$varNo)) {

-      if ($isOptional) return true;

-      $this->triggerError ("Variable \"$variableName\" not defined in template.");

-      return false; }

+	  if ($isOptional) return true;

+	  $this->triggerError ("Variable \"$variableName\" not defined in template.");

+	  return false; }

    $this->varTab[$varNo]['varValue'] = $variableValue;

    return true; }

 

@@ -605,11 +605,11 @@ 
 function addBlock($blockName) {

    if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }

    if (!$this->lookupBlockName($blockName,$blockNo)) {

-      $this->triggerError ("Block \"$blockName\" not defined in template.");

-      return false; }

+	  $this->triggerError ("Block \"$blockName\" not defined in template.");

+	  return false; }

    while ($blockNo != -1) {

-      $this->addBlockByNo($blockNo);

-      $blockNo = $this->blockTab[$blockNo]['nextWithSameName']; }

+	  $this->addBlockByNo($blockNo);

+	  $blockNo = $this->blockTab[$blockNo]['nextWithSameName']; }

    return true; }

 

 /**

@@ -620,25 +620,25 @@ 
    $this->registerBlockInstance ($blockInstNo);

    $bitr =& $this->blockInstTab[$blockInstNo];

    if ($btr['firstBlockInstNo'] == -1)

-      $btr['firstBlockInstNo'] = $blockInstNo;

+	  $btr['firstBlockInstNo'] = $blockInstNo;

    if ($btr['lastBlockInstNo'] != -1)

-      $this->blockInstTab[$btr['lastBlockInstNo']]['nextBlockInstNo'] = $blockInstNo;

-         // set forward pointer of chain

+	  $this->blockInstTab[$btr['lastBlockInstNo']]['nextBlockInstNo'] = $blockInstNo;

+		 // set forward pointer of chain

    $btr['lastBlockInstNo'] = $blockInstNo;

    $parentBlockNo = $btr['parentBlockNo'];

    $blockVarCnt = $btr['blockVarCnt'];

    $bitr['blockNo'] = $blockNo;

    $bitr['instanceLevel'] = $btr['instances']++;

    if ($parentBlockNo == -1)

-      $bitr['parentInstLevel'] = -1;

-    else

-      $bitr['parentInstLevel'] = $this->blockTab[$parentBlockNo]['instances'];

+	  $bitr['parentInstLevel'] = -1;

+	else

+	  $bitr['parentInstLevel'] = $this->blockTab[$parentBlockNo]['instances'];

    $bitr['nextBlockInstNo'] = -1;

    $bitr['blockVarTab'] = array();

    // copy instance variables for this block

    for ($blockVarNo=0; $blockVarNo<$blockVarCnt; $blockVarNo++) {

-      $varNo = $btr['blockVarNoToVarNoMap'][$blockVarNo];

-      $bitr['blockVarTab'][$blockVarNo] = $this->varTab[$varNo]['varValue']; }}

+	  $varNo = $btr['blockVarNoToVarNoMap'][$blockVarNo];

+	  $bitr['blockVarTab'][$blockVarNo] = $this->varTab[$varNo]['varValue']; }}

 

 /**

 * @access private

@@ -706,10 +706,10 @@ 
 function generateOutputPage() {

    if (!$this->templateValid) {$this->triggerError ("Template not valid."); return false; }

    if ($this->blockTab[0]['instances'] == 0)

-      $this->addBlockByNo (0);        // add main block

+	  $this->addBlockByNo (0);        // add main block

    for ($blockNo=0; $blockNo < $this->blockTabCnt; $blockNo++) {

-       $btr =& $this->blockTab[$blockNo];

-       $btr['currBlockInstNo'] = $btr['firstBlockInstNo']; }

+	   $btr =& $this->blockTab[$blockNo];

+	   $btr['currBlockInstNo'] = $btr['firstBlockInstNo']; }

    $this->outputError = false;

    $this->writeBlockInstances (0, -1);

    if ($this->outputError) return false;

@@ -724,14 +724,14 @@ 
 function writeBlockInstances ($blockNo, $parentInstLevel) {

    $btr =& $this->blockTab[$blockNo];

    while (!$this->outputError) {

-      $blockInstNo = $btr['currBlockInstNo'];

-      if ($blockInstNo == -1) break;

-      $bitr =& $this->blockInstTab[$blockInstNo];

-      if ($bitr['parentInstLevel'] < $parentInstLevel)

-         $this->programLogicError (2);

-      if ($bitr['parentInstLevel'] > $parentInstLevel) break;

-      $this->writeBlockInstance ($blockInstNo);

-      $btr['currBlockInstNo'] = $bitr['nextBlockInstNo']; }}

+	  $blockInstNo = $btr['currBlockInstNo'];

+	  if ($blockInstNo == -1) break;

+	  $bitr =& $this->blockInstTab[$blockInstNo];

+	  if ($bitr['parentInstLevel'] < $parentInstLevel)

+		 $this->programLogicError (2);

+	  if ($bitr['parentInstLevel'] > $parentInstLevel) break;

+	  $this->writeBlockInstance ($blockInstNo);

+	  $btr['currBlockInstNo'] = $bitr['nextBlockInstNo']; }}

 

 /**

 * @access private

@@ -744,46 +744,46 @@ 
    $subBlockNo = $blockNo + 1;

    $varRefNo = $btr['firstVarRefNo'];

    while (!$this->outputError) {

-      $tPos2 = $btr['tPosContentsEnd'];

-      $kind = 0;                                // assume end-of-block

-      if ($varRefNo != -1 && $varRefNo < $this->varRefTabCnt) {  // check for variable reference

-         $vrtr =& $this->varRefTab[$varRefNo];

-         if ($vrtr['tPosBegin'] < $tPos) {

-            $varRefNo += 1;

-            continue; }

-         if ($vrtr['tPosBegin'] < $tPos2) {

-            $tPos2 = $vrtr['tPosBegin'];

-            $kind = 1; }}

-      if ($subBlockNo < $this->blockTabCnt) {   // check for subblock

-         $subBtr =& $this->blockTab[$subBlockNo];

-         if ($subBtr['tPosBegin'] < $tPos) {

-            $subBlockNo += 1;

-            continue; }

-         if ($subBtr['tPosBegin'] < $tPos2) {

-            $tPos2 = $subBtr['tPosBegin'];

-            $kind = 2; }}

-      if ($tPos2 > $tPos)

-         $this->writeString (substr($this->template,$tPos,$tPos2-$tPos));

-      switch ($kind) {

-         case 0:         // end of block

-            return;

-         case 1:         // variable

-            $vrtr =& $this->varRefTab[$varRefNo];

-            if ($vrtr['blockNo'] != $blockNo)

-               $this->programLogicError (4);

-            $variableValue = $bitr['blockVarTab'][$vrtr['blockVarNo']];

-            $this->writeString ($variableValue);

-            $tPos = $vrtr['tPosEnd'];

-            $varRefNo += 1;

-            break;

-         case 2:         // sub block

-            $subBtr =& $this->blockTab[$subBlockNo];

-            if ($subBtr['parentBlockNo'] != $blockNo)

-               $this->programLogicError (3);

-            $this->writeBlockInstances ($subBlockNo, $bitr['instanceLevel']);  // recursive call

-            $tPos = $subBtr['tPosEnd'];

-            $subBlockNo += 1;

-            break; }}}

+	  $tPos2 = $btr['tPosContentsEnd'];

+	  $kind = 0;                                // assume end-of-block

+	  if ($varRefNo != -1 && $varRefNo < $this->varRefTabCnt) {  // check for variable reference

+		 $vrtr =& $this->varRefTab[$varRefNo];

+		 if ($vrtr['tPosBegin'] < $tPos) {

+			$varRefNo += 1;

+			continue; }

+		 if ($vrtr['tPosBegin'] < $tPos2) {

+			$tPos2 = $vrtr['tPosBegin'];

+			$kind = 1; }}

+	  if ($subBlockNo < $this->blockTabCnt) {   // check for subblock

+		 $subBtr =& $this->blockTab[$subBlockNo];

+		 if ($subBtr['tPosBegin'] < $tPos) {

+			$subBlockNo += 1;

+			continue; }

+		 if ($subBtr['tPosBegin'] < $tPos2) {

+			$tPos2 = $subBtr['tPosBegin'];

+			$kind = 2; }}

+	  if ($tPos2 > $tPos)

+		 $this->writeString (substr($this->template,$tPos,$tPos2-$tPos));

+	  switch ($kind) {

+		 case 0:         // end of block

+			return;

+		 case 1:         // variable

+			$vrtr =& $this->varRefTab[$varRefNo];

+			if ($vrtr['blockNo'] != $blockNo)

+			   $this->programLogicError (4);

+			$variableValue = $bitr['blockVarTab'][$vrtr['blockVarNo']];

+			$this->writeString ($variableValue);

+			$tPos = $vrtr['tPosEnd'];

+			$varRefNo += 1;

+			break;

+		 case 2:         // sub block

+			$subBtr =& $this->blockTab[$subBlockNo];

+			if ($subBtr['parentBlockNo'] != $blockNo)

+			   $this->programLogicError (3);

+			$this->writeBlockInstances ($subBlockNo, $bitr['instanceLevel']);  // recursive call

+			$tPos = $subBtr['tPosEnd'];

+			$subBlockNo += 1;

+			break; }}}

 

 /**

 * @access private

@@ -791,17 +791,17 @@ 
 function writeString ($s) {

    if ($this->outputError) return;

    switch ($this->outputMode) {

-      case 0:            // output to PHP output stream

-         if (!print($s))

-            $this->outputError = true;

-         break;

-      case 1:            // output to file

-         $rc = fwrite($this->outputFileHandle, $s);

-         if ($rc === false) $this->outputError = true;

-         break;

-      case 2:            // output to string

-         $this->outputString .= $s;

-         break; }}

+	  case 0:            // output to PHP output stream

+		 if (!print($s))

+			$this->outputError = true;

+		 break;

+	  case 1:            // output to file

+		 $rc = fwrite($this->outputFileHandle, $s);

+		 if ($rc === false) $this->outputError = true;

+		 break;

+	  case 2:            // output to string

+		 $this->outputString .= $s;

+		 break; }}

 

 //--- name lookup routines ------------------------------------------------------------------------------------------

 

@@ -838,9 +838,9 @@ 
 */

 function readFileIntoString ($fileName, &$s) {

    if (function_exists('version_compare') && version_compare(phpversion(),"4.3.0",">=")) {

-      $s = file_get_contents($fileName);

-      if ($s === false) return false;

-      return true; }

+	  $s = file_get_contents($fileName);

+	  if ($s === false) return false;

+	  return true; }

    $fh = fopen($fileName,"rb");

    if ($fh === false) return false;

    $fileSize = filesize($fileName);

@@ -888,9 +888,9 @@ 
    while ($p < $sLen && ord($s{$p}) <= 32) $p++;

    if ($p >= $sLen) return false;

    if (substr($s,$p,1) == '"')

-      return $this->parseQuotedString($s,$p,$w);

-    else

-      return $this->parseWord($s,$p,$w); }

+	  return $this->parseQuotedString($s,$p,$w);

+	else

+	  return $this->parseWord($s,$p,$w); }

 

 /**

 * Combine two file system paths.

@@ -901,9 +901,9 @@ 
    $s = $path1;

    if (substr($s,-1) != '\\' && substr($s,-1) != '/') $s = $s . "/";

    if (substr($path2,0,1) == '\\' || substr($path2,0,1) == '/')

-      $s = $s . substr($path2,1);

-    else

-      $s = $s . $path2;

+	  $s = $s . substr($path2,1);

+	else

+	  $s = $s . $path2;

    return $s; }

 

 /**

lib/jimIcon.php

Indentation +233 added lines, -233 removed lines

@@ -17,254 +17,254 @@
 //   http://creativecommons.org/publicdomain/zero/1.0/
 
 class jimIcon {
-        // Get an image color from a string
-        function get_color($str, $img) {
-                $b = ord($str[0]);
-                $g = ord($str[1]);
-                $r = ord($str[2]);
-                if (strlen($str) > 3) {
-                        $a = 127 - (ord($str[3]) / 2);
-                        if ($a != 0 && $a != 127)
-                                $this->had_alpha = 1;
-                } else {
-                        $a = 0;
-                }
-                if ($a != 127)
-                        $this->all_transaprent = 0;
-                return imagecolorallocatealpha($img, $r, $g, $b, $a);
-        }
+		// Get an image color from a string
+		function get_color($str, $img) {
+				$b = ord($str[0]);
+				$g = ord($str[1]);
+				$r = ord($str[2]);
+				if (strlen($str) > 3) {
+						$a = 127 - (ord($str[3]) / 2);
+						if ($a != 0 && $a != 127)
+								$this->had_alpha = 1;
+				} else {
+						$a = 0;
+				}
+				if ($a != 127)
+						$this->all_transaprent = 0;
+				return imagecolorallocatealpha($img, $r, $g, $b, $a);
+		}
 
-        // Given a string with the contents of an .ICO,
-        // return a GD image of the icon, or false on error.
-        function fromiconstring($ico) {
-                $this->error = "(unknown error)";
-                $this->had_alpha = 0;
+		// Given a string with the contents of an .ICO,
+		// return a GD image of the icon, or false on error.
+		function fromiconstring($ico) {
+				$this->error = "(unknown error)";
+				$this->had_alpha = 0;
 
-                // Read header
-                if (strlen($ico) < 6) {
-                        $this->error = "too short";
-                        return false;
-                }
-                $h = unpack("vzero/vtype/vnum", $ico);
+				// Read header
+				if (strlen($ico) < 6) {
+						$this->error = "too short";
+						return false;
+				}
+				$h = unpack("vzero/vtype/vnum", $ico);
 
-                // Must be ICO format with at least one image
-                if ($h["zero"] != 0 || $h["type"] != 1 || $h["num"] == 0) {
-                        // See if we can just parse it with GD directly
-                        // if it's not ICO format; maybe it was a mislabeled
-                        // PNG or something.
-                        $i = @imagecreatefromstring($ico);
-                        if ($i) {
-                                imagesavealpha($i, true);
-                                return $i;
-                        }
-                        $this->error = "not ICO or other image";
-                        return false;
-                }
+				// Must be ICO format with at least one image
+				if ($h["zero"] != 0 || $h["type"] != 1 || $h["num"] == 0) {
+						// See if we can just parse it with GD directly
+						// if it's not ICO format; maybe it was a mislabeled
+						// PNG or something.
+						$i = @imagecreatefromstring($ico);
+						if ($i) {
+								imagesavealpha($i, true);
+								return $i;
+						}
+						$this->error = "not ICO or other image";
+						return false;
+				}
 
-                // Read directory entries to find the biggest image
-                $most_pixels = 0;
-                for ($i = 0; $i < $h["num"]; $i++) {
-                        $entry = substr($ico, 6 + 16 * $i, 16);
-                        if (!$entry || strlen($entry) < 16)
-                                continue;
-                        $e = unpack("Cwidth/" .
-                                    "Cheight/" .
-                                    "Ccolors/" .
-                                    "Czero/" .
-                                    "vplanes/" .
-                                    "vbpp/" .
-                                    "Vsize/" .
-                                    "Voffset/",
-                                    $entry);
-                        if ($e["width"] == 0)
-                                $e["width"] = 256;
-                        if ($e["height"] == 0)
-                                $e["height"] = 256;
-                        if ($e["zero"] != 0) {
-                                $this->error = "nonzero reserved field";
-                                return false;
-                        }
-                        $pixels = $e["width"] * $e["height"];
-                        if ($pixels > $most_pixels) {
-                                $most_pixels = $pixels;
-                                $most = $e;
-                        }
-                }
-                if ($most_pixels == 0) {
-                        $this->error = "no pixels";
-                        return false;
-                }
-                $e = $most;
+				// Read directory entries to find the biggest image
+				$most_pixels = 0;
+				for ($i = 0; $i < $h["num"]; $i++) {
+						$entry = substr($ico, 6 + 16 * $i, 16);
+						if (!$entry || strlen($entry) < 16)
+								continue;
+						$e = unpack("Cwidth/" .
+									"Cheight/" .
+									"Ccolors/" .
+									"Czero/" .
+									"vplanes/" .
+									"vbpp/" .
+									"Vsize/" .
+									"Voffset/",
+									$entry);
+						if ($e["width"] == 0)
+								$e["width"] = 256;
+						if ($e["height"] == 0)
+								$e["height"] = 256;
+						if ($e["zero"] != 0) {
+								$this->error = "nonzero reserved field";
+								return false;
+						}
+						$pixels = $e["width"] * $e["height"];
+						if ($pixels > $most_pixels) {
+								$most_pixels = $pixels;
+								$most = $e;
+						}
+				}
+				if ($most_pixels == 0) {
+						$this->error = "no pixels";
+						return false;
+				}
+				$e = $most;
 
-                // Extract image data
-                $data = substr($ico, $e["offset"], $e["size"]);
-                if (!$data || strlen($data) != $e["size"]) {
-                        $this->error = "bad image data";
-                        return false;
-                }
+				// Extract image data
+				$data = substr($ico, $e["offset"], $e["size"]);
+				if (!$data || strlen($data) != $e["size"]) {
+						$this->error = "bad image data";
+						return false;
+				}
 
-                // See if we can parse it (might be PNG format here)
-                $i = @imagecreatefromstring($data);
-                if ($i) {
-                        imagesavealpha($img, true);
-                        return $i;
-                }
+				// See if we can parse it (might be PNG format here)
+				$i = @imagecreatefromstring($data);
+				if ($i) {
+						imagesavealpha($img, true);
+						return $i;
+				}
 
-                // Must be a BMP.  Parse it ourselves.
-                $img = imagecreatetruecolor($e["width"], $e["height"]);
-                imagesavealpha($img, true);
-                $bg = imagecolorallocatealpha($img, 255, 0, 0, 127);
-                imagefill($img, 0, 0, $bg);
+				// Must be a BMP.  Parse it ourselves.
+				$img = imagecreatetruecolor($e["width"], $e["height"]);
+				imagesavealpha($img, true);
+				$bg = imagecolorallocatealpha($img, 255, 0, 0, 127);
+				imagefill($img, 0, 0, $bg);
 
-                // Skip over the BITMAPCOREHEADER or BITMAPINFOHEADER;
-                // we'll just assume the palette and pixel data follow
-                // in the most obvious format as described by the icon
-                // directory entry.
-                $bitmapinfo = unpack("Vsize", $data);
-                if ($bitmapinfo["size"] == 40) {
-                        $info = unpack("Vsize/" .
-                                       "Vwidth/" .
-                                       "Vheight/" .
-                                       "vplanes/" .
-                                       "vbpp/" .
-                                       "Vcompress/" .
-                                       "Vsize/" .
-                                       "Vxres/" .
-                                       "Vyres/" .
-                                       "Vpalcolors/" .
-                                       "Vimpcolors/", $data);
-                        if ($e["bpp"] == 0) {
-                                $e["bpp"] = $info["bpp"];
-                        }
-                }
-                $data = substr($data, $bitmapinfo["size"]);
+				// Skip over the BITMAPCOREHEADER or BITMAPINFOHEADER;
+				// we'll just assume the palette and pixel data follow
+				// in the most obvious format as described by the icon
+				// directory entry.
+				$bitmapinfo = unpack("Vsize", $data);
+				if ($bitmapinfo["size"] == 40) {
+						$info = unpack("Vsize/" .
+									   "Vwidth/" .
+									   "Vheight/" .
+									   "vplanes/" .
+									   "vbpp/" .
+									   "Vcompress/" .
+									   "Vsize/" .
+									   "Vxres/" .
+									   "Vyres/" .
+									   "Vpalcolors/" .
+									   "Vimpcolors/", $data);
+						if ($e["bpp"] == 0) {
+								$e["bpp"] = $info["bpp"];
+						}
+				}
+				$data = substr($data, $bitmapinfo["size"]);
 
-                $height = $e["height"];
-                $width = $e["width"];
-                $bpp = $e["bpp"];
+				$height = $e["height"];
+				$width = $e["width"];
+				$bpp = $e["bpp"];
 
-                // For indexed images, we only support 1, 4, or 8 BPP
-                switch ($bpp) {
-                case 1:
-                case 4:
-                case 8:
-                        $indexed = 1;
-                        break;
-                case 24:
-                case 32:
-                        $indexed = 0;
-                        break;
-                default:
-                        $this->error = "bad BPP $bpp";
-                        return false;
-                }
+				// For indexed images, we only support 1, 4, or 8 BPP
+				switch ($bpp) {
+				case 1:
+				case 4:
+				case 8:
+						$indexed = 1;
+						break;
+				case 24:
+				case 32:
+						$indexed = 0;
+						break;
+				default:
+						$this->error = "bad BPP $bpp";
+						return false;
+				}
 
-                $offset = 0;
-                if ($indexed) {
-                        $palette = array();
-                        $this->all_transparent = 1;
-                        for ($i = 0; $i < (1 << $bpp); $i++) {
-                                $entry = substr($data, $i * 4, 4);
-                                $palette[$i] = $this->get_color($entry, $img);
-                        }
-                        $offset = $i * 4;
+				$offset = 0;
+				if ($indexed) {
+						$palette = array();
+						$this->all_transparent = 1;
+						for ($i = 0; $i < (1 << $bpp); $i++) {
+								$entry = substr($data, $i * 4, 4);
+								$palette[$i] = $this->get_color($entry, $img);
+						}
+						$offset = $i * 4;
 
-                        // Hack for some icons: if everything was transparent,
-                        // discard alpha channel.
-                        if ($this->all_transparent) {
-                                for ($i = 0; $i < (1 << $bpp); $i++) {
-                                        $palette[$i] &= 0xffffff;
-                                }
-                        }
-                }
+						// Hack for some icons: if everything was transparent,
+						// discard alpha channel.
+						if ($this->all_transparent) {
+								for ($i = 0; $i < (1 << $bpp); $i++) {
+										$palette[$i] &= 0xffffff;
+								}
+						}
+				}
 
-                // Assume image data follows in bottom-up order.
-                // First the "XOR" image
-                if ((strlen($data) - $offset) < ($bpp * $height * $width / 8)) {
-                        $this->error = "short data";
-                        return false;
-                }
-                $XOR = array();
-                for ($y = $height - 1; $y >= 0; $y--) {
-                        $x = 0;
-                        while ($x < $width) {
-                                if (!$indexed) {
-                                        $bytes = $bpp / 8;
-                                        $entry = substr($data, $offset, $bytes);
-                                        $pixel = $this->get_color($entry, $img);
-                                        $XOR[$y][$x] = $pixel;
-                                        $x++;
-                                        $offset += $bytes;
-                                } elseif ($bpp == 1) {
-                                        $p = ord($data[$offset]);
-                                        for ($b = 0x80; $b > 0; $b >>= 1) {
-                                                if ($p & $b) {
-                                                        $pixel = $palette[1];
-                                                } else {
-                                                        $pixel = $palette[0];
-                                                }
-                                                $XOR[$y][$x] = $pixel;
-                                                $x++;
-                                        }
-                                        $offset++;
-                                } elseif ($bpp == 4) {
-                                        $p = ord($data[$offset]);
-                                        $pixel1 = $palette[$p >> 4];
-                                        $pixel2 = $palette[$p & 0x0f];
-                                        $XOR[$y][$x] = $pixel1;
-                                        $XOR[$y][$x+1] = $pixel2;
-                                        $x += 2;
-                                        $offset++;
-                                } elseif ($bpp == 8) {
-                                        $pixel = $palette[ord($data[$offset])];
-                                        $XOR[$y][$x] = $pixel;
-                                        $x += 1;
-                                        $offset++;
-                                } else {
-                                        $this->error = "bad BPP";
-                                        return false;
-                                }
-                        }
-                        // End of row padding
-                        while ($offset & 3)
-                                $offset++;
-                }
+				// Assume image data follows in bottom-up order.
+				// First the "XOR" image
+				if ((strlen($data) - $offset) < ($bpp * $height * $width / 8)) {
+						$this->error = "short data";
+						return false;
+				}
+				$XOR = array();
+				for ($y = $height - 1; $y >= 0; $y--) {
+						$x = 0;
+						while ($x < $width) {
+								if (!$indexed) {
+										$bytes = $bpp / 8;
+										$entry = substr($data, $offset, $bytes);
+										$pixel = $this->get_color($entry, $img);
+										$XOR[$y][$x] = $pixel;
+										$x++;
+										$offset += $bytes;
+								} elseif ($bpp == 1) {
+										$p = ord($data[$offset]);
+										for ($b = 0x80; $b > 0; $b >>= 1) {
+												if ($p & $b) {
+														$pixel = $palette[1];
+												} else {
+														$pixel = $palette[0];
+												}
+												$XOR[$y][$x] = $pixel;
+												$x++;
+										}
+										$offset++;
+								} elseif ($bpp == 4) {
+										$p = ord($data[$offset]);
+										$pixel1 = $palette[$p >> 4];
+										$pixel2 = $palette[$p & 0x0f];
+										$XOR[$y][$x] = $pixel1;
+										$XOR[$y][$x+1] = $pixel2;
+										$x += 2;
+										$offset++;
+								} elseif ($bpp == 8) {
+										$pixel = $palette[ord($data[$offset])];
+										$XOR[$y][$x] = $pixel;
+										$x += 1;
+										$offset++;
+								} else {
+										$this->error = "bad BPP";
+										return false;
+								}
+						}
+						// End of row padding
+						while ($offset & 3)
+								$offset++;
+				}
 
-                // Now the "AND" image, which is 1 bit per pixel.  Ignore
-                // if some of our image data already had alpha values,
-                // or if there isn't enough data left.
-                if ($this->had_alpha ||
-                    ((strlen($data) - $offset) < ($height * $width / 8))) {
-                        // Just return what we've got
-                        for ($y = 0; $y < $height; $y++) {
-                                for ($x = 0; $x < $width; $x++) {
-                                        imagesetpixel($img, $x, $y,
-                                                      $XOR[$y][$x]);
-                                }
-                        }
-                        return $img;
-                }
+				// Now the "AND" image, which is 1 bit per pixel.  Ignore
+				// if some of our image data already had alpha values,
+				// or if there isn't enough data left.
+				if ($this->had_alpha ||
+					((strlen($data) - $offset) < ($height * $width / 8))) {
+						// Just return what we've got
+						for ($y = 0; $y < $height; $y++) {
+								for ($x = 0; $x < $width; $x++) {
+										imagesetpixel($img, $x, $y,
+													  $XOR[$y][$x]);
+								}
+						}
+						return $img;
+				}
 
-                // Mask what we have with the "AND" image
-                for ($y = $height - 1; $y >= 0; $y--) {
-                        $x = 0;
-                        while ($x < $width) {
-                                for ($b = 0x80;
-                                     $b > 0 && $x < $width; $b >>= 1) {
-                                        if (!(ord($data[$offset]) & $b)) {
-                                                imagesetpixel($img, $x, $y,
-                                                              $XOR[$y][$x]);
-                                        }
-                                        $x++;
-                                }
-                                $offset++;
-                        }
+				// Mask what we have with the "AND" image
+				for ($y = $height - 1; $y >= 0; $y--) {
+						$x = 0;
+						while ($x < $width) {
+								for ($b = 0x80;
+									 $b > 0 && $x < $width; $b >>= 1) {
+										if (!(ord($data[$offset]) & $b)) {
+												imagesetpixel($img, $x, $y,
+															  $XOR[$y][$x]);
+										}
+										$x++;
+								}
+								$offset++;
+						}
 
-                        // End of row padding
-                        while ($offset & 3)
-                                $offset++;
-                }
-                return $img;
-        }
+						// End of row padding
+						while ($offset & 3)
+								$offset++;
+				}
+				return $img;
+		}
 }
 ?>
\ No newline at end of file

lib/floIcon.php

Indentation +9 added lines, -9 removed lines

@@ -4,17 +4,17 @@
 require_once "jimIcon.php";
 
 class floIconIcon {
-        function getImageResource() {
-                return $this->img;
-        }
+		function getImageResource() {
+				return $this->img;
+		}
 }
 
 class floIcon {
-        function readICO($file) {
-                $jim = new jimIcon();
-                $icon = new floIconIcon();
-                $icon->img = $jim->fromiconstring(file_get_contents($file));
-                $this->images = array($icon);
-        }
+		function readICO($file) {
+				$jim = new jimIcon();
+				$icon = new floIconIcon();
+				$icon->img = $jim->fromiconstring(file_get_contents($file));
+				$this->images = array($icon);
+		}
 }
 ?>

lib/phpqrcode/tools/merge.php

Indentation +32 added lines, -32 removed lines

@@ -25,46 +25,46 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

  */

  

-    $QR_BASEDIR = dirname(__FILE__).DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR;

-    $QR_TOOLSDIR = dirname(__FILE__).DIRECTORY_SEPARATOR;

+	$QR_BASEDIR = dirname(__FILE__).DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR;

+	$QR_TOOLSDIR = dirname(__FILE__).DIRECTORY_SEPARATOR;

     

-    $outputFile = $QR_BASEDIR.'phpqrcode.php';

+	$outputFile = $QR_BASEDIR.'phpqrcode.php';

     

-    // Required libs

+	// Required libs

     

-    $fileList = array(

-        $QR_BASEDIR.'qrconst.php',

-        $QR_TOOLSDIR.'merged_config.php',

-        $QR_BASEDIR.'qrtools.php',

-        $QR_BASEDIR.'qrspec.php',

-        $QR_BASEDIR.'qrimage.php',

-        $QR_BASEDIR.'qrinput.php',

-        $QR_BASEDIR.'qrbitstream.php',

-        $QR_BASEDIR.'qrsplit.php',

-        $QR_BASEDIR.'qrrscode.php',

-        $QR_BASEDIR.'qrmask.php',

-        $QR_BASEDIR.'qrencode.php'

-    );

+	$fileList = array(

+		$QR_BASEDIR.'qrconst.php',

+		$QR_TOOLSDIR.'merged_config.php',

+		$QR_BASEDIR.'qrtools.php',

+		$QR_BASEDIR.'qrspec.php',

+		$QR_BASEDIR.'qrimage.php',

+		$QR_BASEDIR.'qrinput.php',

+		$QR_BASEDIR.'qrbitstream.php',

+		$QR_BASEDIR.'qrsplit.php',

+		$QR_BASEDIR.'qrrscode.php',

+		$QR_BASEDIR.'qrmask.php',

+		$QR_BASEDIR.'qrencode.php'

+	);

     

-    $headerFile = $QR_TOOLSDIR.'merged_header.php';

-    $versionFile = $QR_BASEDIR.'VERSION';

+	$headerFile = $QR_TOOLSDIR.'merged_header.php';

+	$versionFile = $QR_BASEDIR.'VERSION';

     

-    $outputCode = '';

+	$outputCode = '';

     

-    foreach($fileList as $fileName) {

-        $outputCode .= "\n\n".'//---- '.basename($fileName).' -----------------------------'."\n\n";

-        $anotherCode = file_get_contents($fileName);

-        $anotherCode = preg_replace ('/^<\?php/', '', $anotherCode);

-        $anotherCode = preg_replace ('/\?>\*$/', '', $anotherCode);

-        $outputCode .= "\n\n".$anotherCode."\n\n";

-    }

+	foreach($fileList as $fileName) {

+		$outputCode .= "\n\n".'//---- '.basename($fileName).' -----------------------------'."\n\n";

+		$anotherCode = file_get_contents($fileName);

+		$anotherCode = preg_replace ('/^<\?php/', '', $anotherCode);

+		$anotherCode = preg_replace ('/\?>\*$/', '', $anotherCode);

+		$outputCode .= "\n\n".$anotherCode."\n\n";

+	}

     

 	$versionDataEx = explode("\n", file_get_contents($versionFile));

 	

-    $outputContents = file_get_contents($headerFile);

-    $outputContents .= "\n\n/*\n * Version: ".trim($versionDataEx[0])."\n * Build: ".trim($versionDataEx[1])."\n */\n\n";

-    $outputContents .= $outputCode;

+	$outputContents = file_get_contents($headerFile);

+	$outputContents .= "\n\n/*\n * Version: ".trim($versionDataEx[0])."\n * Build: ".trim($versionDataEx[1])."\n */\n\n";

+	$outputContents .= $outputCode;

     

-    file_put_contents($outputFile, $outputContents);

+	file_put_contents($outputFile, $outputContents);

     

-    
\ No newline at end of file
+	
\ No newline at end of file

lib/phpqrcode/tools/merged_config.php

Indentation +8 added lines, -8 removed lines

@@ -5,13 +5,13 @@
  * Config file, tuned-up for merged verion

  */

      

-    define('QR_CACHEABLE', false);       // use cache - more disk reads but less CPU power, masks and format templates are stored there

-    define('QR_CACHE_DIR', false);       // used when QR_CACHEABLE === true

-    define('QR_LOG_DIR', false);         // default error logs dir   

+	define('QR_CACHEABLE', false);       // use cache - more disk reads but less CPU power, masks and format templates are stored there

+	define('QR_CACHE_DIR', false);       // used when QR_CACHEABLE === true

+	define('QR_LOG_DIR', false);         // default error logs dir   

     

-    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

-    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

-    define('QR_DEFAULT_MASK', 2);                                                               // when QR_FIND_BEST_MASK === false

+	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

+	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

+	define('QR_DEFAULT_MASK', 2);                                                               // when QR_FIND_BEST_MASK === false

                                                   

-    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

-                                                  
\ No newline at end of file
+	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

+												  
\ No newline at end of file

lib/phpqrcode/qrbitstream.php

Indentation +120 added lines, -120 removed lines

@@ -25,156 +25,156 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

  */

      

-    class QRbitstream {

+	class QRbitstream {

     

-        public $data = array();

+		public $data = array();

         

-        //----------------------------------------------------------------------

-        public function size()

-        {

-            return count($this->data);

-        }

+		//----------------------------------------------------------------------

+		public function size()

+		{

+			return count($this->data);

+		}

         

-        //----------------------------------------------------------------------

-        public function allocate($setLength)

-        {

-            $this->data = array_fill(0, $setLength, 0);

-            return 0;

-        }

+		//----------------------------------------------------------------------

+		public function allocate($setLength)

+		{

+			$this->data = array_fill(0, $setLength, 0);

+			return 0;

+		}

     

-        //----------------------------------------------------------------------

-        public static function newFromNum($bits, $num)

-        {

-            $bstream = new QRbitstream();

-            $bstream->allocate($bits);

+		//----------------------------------------------------------------------

+		public static function newFromNum($bits, $num)

+		{

+			$bstream = new QRbitstream();

+			$bstream->allocate($bits);

             

-            $mask = 1 << ($bits - 1);

-            for($i=0; $i<$bits; $i++) {

-                if($num & $mask) {

-                    $bstream->data[$i] = 1;

-                } else {

-                    $bstream->data[$i] = 0;

-                }

-                $mask = $mask >> 1;

-            }

+			$mask = 1 << ($bits - 1);

+			for($i=0; $i<$bits; $i++) {

+				if($num & $mask) {

+					$bstream->data[$i] = 1;

+				} else {

+					$bstream->data[$i] = 0;

+				}

+				$mask = $mask >> 1;

+			}

 

-            return $bstream;

-        }

+			return $bstream;

+		}

         

-        //----------------------------------------------------------------------

-        public static function newFromBytes($size, $data)

-        {

-            $bstream = new QRbitstream();

-            $bstream->allocate($size * 8);

-            $p=0;

+		//----------------------------------------------------------------------

+		public static function newFromBytes($size, $data)

+		{

+			$bstream = new QRbitstream();

+			$bstream->allocate($size * 8);

+			$p=0;

 

-            for($i=0; $i<$size; $i++) {

-                $mask = 0x80;

-                for($j=0; $j<8; $j++) {

-                    if($data[$i] & $mask) {

-                        $bstream->data[$p] = 1;

-                    } else {

-                        $bstream->data[$p] = 0;

-                    }

-                    $p++;

-                    $mask = $mask >> 1;

-                }

-            }

+			for($i=0; $i<$size; $i++) {

+				$mask = 0x80;

+				for($j=0; $j<8; $j++) {

+					if($data[$i] & $mask) {

+						$bstream->data[$p] = 1;

+					} else {

+						$bstream->data[$p] = 0;

+					}

+					$p++;

+					$mask = $mask >> 1;

+				}

+			}

 

-            return $bstream;

-        }

+			return $bstream;

+		}

         

-        //----------------------------------------------------------------------

-        public function append(QRbitstream $arg)

-        {

-            if (is_null($arg)) {

-                return -1;

-            }

+		//----------------------------------------------------------------------

+		public function append(QRbitstream $arg)

+		{

+			if (is_null($arg)) {

+				return -1;

+			}

             

-            if($arg->size() == 0) {

-                return 0;

-            }

+			if($arg->size() == 0) {

+				return 0;

+			}

             

-            if($this->size() == 0) {

-                $this->data = $arg->data;

-                return 0;

-            }

+			if($this->size() == 0) {

+				$this->data = $arg->data;

+				return 0;

+			}

             

-            $this->data = array_values(array_merge($this->data, $arg->data));

+			$this->data = array_values(array_merge($this->data, $arg->data));

 

-            return 0;

-        }

+			return 0;

+		}

         

-        //----------------------------------------------------------------------

-        public function appendNum($bits, $num)

-        {

-            if ($bits == 0) 

-                return 0;

+		//----------------------------------------------------------------------

+		public function appendNum($bits, $num)

+		{

+			if ($bits == 0) 

+				return 0;

 

-            $b = QRbitstream::newFromNum($bits, $num);

+			$b = QRbitstream::newFromNum($bits, $num);

             

-            if(is_null($b))

-                return -1;

+			if(is_null($b))

+				return -1;

 

-            $ret = $this->append($b);

-            unset($b);

+			$ret = $this->append($b);

+			unset($b);

 

-            return $ret;

-        }

+			return $ret;

+		}

 

-        //----------------------------------------------------------------------

-        public function appendBytes($size, $data)

-        {

-            if ($size == 0) 

-                return 0;

+		//----------------------------------------------------------------------

+		public function appendBytes($size, $data)

+		{

+			if ($size == 0) 

+				return 0;

 

-            $b = QRbitstream::newFromBytes($size, $data);

+			$b = QRbitstream::newFromBytes($size, $data);

             

-            if(is_null($b))

-                return -1;

+			if(is_null($b))

+				return -1;

 

-            $ret = $this->append($b);

-            unset($b);

+			$ret = $this->append($b);

+			unset($b);

 

-            return $ret;

-        }

+			return $ret;

+		}

         

-        //----------------------------------------------------------------------

-        public function toByte()

-        {

+		//----------------------------------------------------------------------

+		public function toByte()

+		{

         

-            $size = $this->size();

+			$size = $this->size();

 

-            if($size == 0) {

-                return array();

-            }

+			if($size == 0) {

+				return array();

+			}

             

-            $data = array_fill(0, (int)(($size + 7) / 8), 0);

-            $bytes = (int)($size / 8);

+			$data = array_fill(0, (int)(($size + 7) / 8), 0);

+			$bytes = (int)($size / 8);

 

-            $p = 0;

+			$p = 0;

             

-            for($i=0; $i<$bytes; $i++) {

-                $v = 0;

-                for($j=0; $j<8; $j++) {

-                    $v = $v << 1;

-                    $v |= $this->data[$p];

-                    $p++;

-                }

-                $data[$i] = $v;

-            }

+			for($i=0; $i<$bytes; $i++) {

+				$v = 0;

+				for($j=0; $j<8; $j++) {

+					$v = $v << 1;

+					$v |= $this->data[$p];

+					$p++;

+				}

+				$data[$i] = $v;

+			}

             

-            if($size & 7) {

-                $v = 0;

-                for($j=0; $j<($size & 7); $j++) {

-                    $v = $v << 1;

-                    $v |= $this->data[$p];

-                    $p++;

-                }

-                $data[$bytes] = $v;

-            }

+			if($size & 7) {

+				$v = 0;

+				for($j=0; $j<($size & 7); $j++) {

+					$v = $v << 1;

+					$v |= $this->data[$p];

+					$p++;

+				}

+				$data[$bytes] = $v;

+			}

 

-            return $data;

-        }

+			return $data;

+		}

 

-    }

+	}

lib/phpqrcode/qrsplit.php

Indentation +229 added lines, -229 removed lines

@@ -30,282 +30,282 @@
  * License along with this library; if not, write to the Free Software

  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

  */

-    class QRsplit {

+	class QRsplit {

 

-        public $dataStr = '';

-        public $input;

-        public $modeHint;

+		public $dataStr = '';

+		public $input;

+		public $modeHint;

 

-        //----------------------------------------------------------------------

-        public function __construct($dataStr, $input, $modeHint) 

-        {

-            $this->dataStr  = $dataStr;

-            $this->input    = $input;

-            $this->modeHint = $modeHint;

-        }

+		//----------------------------------------------------------------------

+		public function __construct($dataStr, $input, $modeHint) 

+		{

+			$this->dataStr  = $dataStr;

+			$this->input    = $input;

+			$this->modeHint = $modeHint;

+		}

         

-        //----------------------------------------------------------------------

-        public static function isdigitat($str, $pos)

-        {    

-            if ($pos >= strlen($str))

-                return false;

+		//----------------------------------------------------------------------

+		public static function isdigitat($str, $pos)

+		{    

+			if ($pos >= strlen($str))

+				return false;

             

-            return ((ord($str[$pos]) >= ord('0'))&&(ord($str[$pos]) <= ord('9')));

-        }

+			return ((ord($str[$pos]) >= ord('0'))&&(ord($str[$pos]) <= ord('9')));

+		}

         

-        //----------------------------------------------------------------------

-        public static function isalnumat($str, $pos)

-        {

-            if ($pos >= strlen($str))

-                return false;

+		//----------------------------------------------------------------------

+		public static function isalnumat($str, $pos)

+		{

+			if ($pos >= strlen($str))

+				return false;

                 

-            return (QRinput::lookAnTable(ord($str[$pos])) >= 0);

-        }

+			return (QRinput::lookAnTable(ord($str[$pos])) >= 0);

+		}

 

-        //----------------------------------------------------------------------

-        public function identifyMode($pos)

-        {

-            if ($pos >= strlen($this->dataStr)) 

-                return QR_MODE_NUL;

+		//----------------------------------------------------------------------

+		public function identifyMode($pos)

+		{

+			if ($pos >= strlen($this->dataStr)) 

+				return QR_MODE_NUL;

                 

-            $c = $this->dataStr[$pos];

+			$c = $this->dataStr[$pos];

             

-            if(self::isdigitat($this->dataStr, $pos)) {

-                return QR_MODE_NUM;

-            } else if(self::isalnumat($this->dataStr, $pos)) {

-                return QR_MODE_AN;

-            } else if($this->modeHint == QR_MODE_KANJI) {

+			if(self::isdigitat($this->dataStr, $pos)) {

+				return QR_MODE_NUM;

+			} else if(self::isalnumat($this->dataStr, $pos)) {

+				return QR_MODE_AN;

+			} else if($this->modeHint == QR_MODE_KANJI) {

             

-                if ($pos+1 < strlen($this->dataStr)) 

-                {

-                    $d = $this->dataStr[$pos+1];

-                    $word = (ord($c) << 8) | ord($d);

-                    if(($word >= 0x8140 && $word <= 0x9ffc) || ($word >= 0xe040 && $word <= 0xebbf)) {

-                        return QR_MODE_KANJI;

-                    }

-                }

-            }

+				if ($pos+1 < strlen($this->dataStr)) 

+				{

+					$d = $this->dataStr[$pos+1];

+					$word = (ord($c) << 8) | ord($d);

+					if(($word >= 0x8140 && $word <= 0x9ffc) || ($word >= 0xe040 && $word <= 0xebbf)) {

+						return QR_MODE_KANJI;

+					}

+				}

+			}

 

-            return QR_MODE_8;

-        } 

+			return QR_MODE_8;

+		} 

         

-        //----------------------------------------------------------------------

-        public function eatNum()

-        {

-            $ln = QRspec::lengthIndicator(QR_MODE_NUM, $this->input->getVersion());

+		//----------------------------------------------------------------------

+		public function eatNum()

+		{

+			$ln = QRspec::lengthIndicator(QR_MODE_NUM, $this->input->getVersion());

 

-            $p = 0;

-            while(self::isdigitat($this->dataStr, $p)) {

-                $p++;

-            }

+			$p = 0;

+			while(self::isdigitat($this->dataStr, $p)) {

+				$p++;

+			}

             

-            $run = $p;

-            $mode = $this->identifyMode($p);

+			$run = $p;

+			$mode = $this->identifyMode($p);

             

-            if($mode == QR_MODE_8) {

-                $dif = QRinput::estimateBitsModeNum($run) + 4 + $ln

-                     + QRinput::estimateBitsMode8(1)         // + 4 + l8

-                     - QRinput::estimateBitsMode8($run + 1); // - 4 - l8

-                if($dif > 0) {

-                    return $this->eat8();

-                }

-            }

-            if($mode == QR_MODE_AN) {

-                $dif = QRinput::estimateBitsModeNum($run) + 4 + $ln

-                     + QRinput::estimateBitsModeAn(1)        // + 4 + la

-                     - QRinput::estimateBitsModeAn($run + 1);// - 4 - la

-                if($dif > 0) {

-                    return $this->eatAn();

-                }

-            }

+			if($mode == QR_MODE_8) {

+				$dif = QRinput::estimateBitsModeNum($run) + 4 + $ln

+					 + QRinput::estimateBitsMode8(1)         // + 4 + l8

+					 - QRinput::estimateBitsMode8($run + 1); // - 4 - l8

+				if($dif > 0) {

+					return $this->eat8();

+				}

+			}

+			if($mode == QR_MODE_AN) {

+				$dif = QRinput::estimateBitsModeNum($run) + 4 + $ln

+					 + QRinput::estimateBitsModeAn(1)        // + 4 + la

+					 - QRinput::estimateBitsModeAn($run + 1);// - 4 - la

+				if($dif > 0) {

+					return $this->eatAn();

+				}

+			}

             

-            $ret = $this->input->append(QR_MODE_NUM, $run, str_split($this->dataStr));

-            if($ret < 0)

-                return -1;

+			$ret = $this->input->append(QR_MODE_NUM, $run, str_split($this->dataStr));

+			if($ret < 0)

+				return -1;

 

-            return $run;

-        }

+			return $run;

+		}

         

-        //----------------------------------------------------------------------

-        public function eatAn()

-        {

-            $la = QRspec::lengthIndicator(QR_MODE_AN,  $this->input->getVersion());

-            $ln = QRspec::lengthIndicator(QR_MODE_NUM, $this->input->getVersion());

+		//----------------------------------------------------------------------

+		public function eatAn()

+		{

+			$la = QRspec::lengthIndicator(QR_MODE_AN,  $this->input->getVersion());

+			$ln = QRspec::lengthIndicator(QR_MODE_NUM, $this->input->getVersion());

 

-            $p = 0;

+			$p = 0;

             

-            while(self::isalnumat($this->dataStr, $p)) {

-                if(self::isdigitat($this->dataStr, $p)) {

-                    $q = $p;

-                    while(self::isdigitat($this->dataStr, $q)) {

-                        $q++;

-                    }

+			while(self::isalnumat($this->dataStr, $p)) {

+				if(self::isdigitat($this->dataStr, $p)) {

+					$q = $p;

+					while(self::isdigitat($this->dataStr, $q)) {

+						$q++;

+					}

                     

-                    $dif = QRinput::estimateBitsModeAn($p) // + 4 + la

-                         + QRinput::estimateBitsModeNum($q - $p) + 4 + $ln

-                         - QRinput::estimateBitsModeAn($q); // - 4 - la

+					$dif = QRinput::estimateBitsModeAn($p) // + 4 + la

+						 + QRinput::estimateBitsModeNum($q - $p) + 4 + $ln

+						 - QRinput::estimateBitsModeAn($q); // - 4 - la

                          

-                    if($dif < 0) {

-                        break;

-                    } else {

-                        $p = $q;

-                    }

-                } else {

-                    $p++;

-                }

-            }

+					if($dif < 0) {

+						break;

+					} else {

+						$p = $q;

+					}

+				} else {

+					$p++;

+				}

+			}

 

-            $run = $p;

+			$run = $p;

 

-            if(!self::isalnumat($this->dataStr, $p)) {

-                $dif = QRinput::estimateBitsModeAn($run) + 4 + $la

-                     + QRinput::estimateBitsMode8(1) // + 4 + l8

-                      - QRinput::estimateBitsMode8($run + 1); // - 4 - l8

-                if($dif > 0) {

-                    return $this->eat8();

-                }

-            }

+			if(!self::isalnumat($this->dataStr, $p)) {

+				$dif = QRinput::estimateBitsModeAn($run) + 4 + $la

+					 + QRinput::estimateBitsMode8(1) // + 4 + l8

+					  - QRinput::estimateBitsMode8($run + 1); // - 4 - l8

+				if($dif > 0) {

+					return $this->eat8();

+				}

+			}

 

-            $ret = $this->input->append(QR_MODE_AN, $run, str_split($this->dataStr));

-            if($ret < 0)

-                return -1;

+			$ret = $this->input->append(QR_MODE_AN, $run, str_split($this->dataStr));

+			if($ret < 0)

+				return -1;

 

-            return $run;

-        }

+			return $run;

+		}

         

-        //----------------------------------------------------------------------

-        public function eatKanji()

-        {

-            $p = 0;

+		//----------------------------------------------------------------------

+		public function eatKanji()

+		{

+			$p = 0;

             

-            while($this->identifyMode($p) == QR_MODE_KANJI) {

-                $p += 2;

-            }

+			while($this->identifyMode($p) == QR_MODE_KANJI) {

+				$p += 2;

+			}

             

-            $ret = $this->input->append(QR_MODE_KANJI, $p, str_split($this->dataStr));

-            if($ret < 0)

-                return -1;

+			$ret = $this->input->append(QR_MODE_KANJI, $p, str_split($this->dataStr));

+			if($ret < 0)

+				return -1;

 

-            return $ret;

-        }

+			return $ret;

+		}

 

-        //----------------------------------------------------------------------

-        public function eat8()

-        {

-            $la = QRspec::lengthIndicator(QR_MODE_AN, $this->input->getVersion());

-            $ln = QRspec::lengthIndicator(QR_MODE_NUM, $this->input->getVersion());

+		//----------------------------------------------------------------------

+		public function eat8()

+		{

+			$la = QRspec::lengthIndicator(QR_MODE_AN, $this->input->getVersion());

+			$ln = QRspec::lengthIndicator(QR_MODE_NUM, $this->input->getVersion());

 

-            $p = 1;

-            $dataStrLen = strlen($this->dataStr);

+			$p = 1;

+			$dataStrLen = strlen($this->dataStr);

             

-            while($p < $dataStrLen) {

+			while($p < $dataStrLen) {

                 

-                $mode = $this->identifyMode($p);

-                if($mode == QR_MODE_KANJI) {

-                    break;

-                }

-                if($mode == QR_MODE_NUM) {

-                    $q = $p;

-                    while(self::isdigitat($this->dataStr, $q)) {

-                        $q++;

-                    }

-                    $dif = QRinput::estimateBitsMode8($p) // + 4 + l8

-                         + QRinput::estimateBitsModeNum($q - $p) + 4 + $ln

-                         - QRinput::estimateBitsMode8($q); // - 4 - l8

-                    if($dif < 0) {

-                        break;

-                    } else {

-                        $p = $q;

-                    }

-                } else if($mode == QR_MODE_AN) {

-                    $q = $p;

-                    while(self::isalnumat($this->dataStr, $q)) {

-                        $q++;

-                    }

-                    $dif = QRinput::estimateBitsMode8($p)  // + 4 + l8

-                         + QRinput::estimateBitsModeAn($q - $p) + 4 + $la

-                         - QRinput::estimateBitsMode8($q); // - 4 - l8

-                    if($dif < 0) {

-                        break;

-                    } else {

-                        $p = $q;

-                    }

-                } else {

-                    $p++;

-                }

-            }

+				$mode = $this->identifyMode($p);

+				if($mode == QR_MODE_KANJI) {

+					break;

+				}

+				if($mode == QR_MODE_NUM) {

+					$q = $p;

+					while(self::isdigitat($this->dataStr, $q)) {

+						$q++;

+					}

+					$dif = QRinput::estimateBitsMode8($p) // + 4 + l8

+						 + QRinput::estimateBitsModeNum($q - $p) + 4 + $ln

+						 - QRinput::estimateBitsMode8($q); // - 4 - l8

+					if($dif < 0) {

+						break;

+					} else {

+						$p = $q;

+					}

+				} else if($mode == QR_MODE_AN) {

+					$q = $p;

+					while(self::isalnumat($this->dataStr, $q)) {

+						$q++;

+					}

+					$dif = QRinput::estimateBitsMode8($p)  // + 4 + l8

+						 + QRinput::estimateBitsModeAn($q - $p) + 4 + $la

+						 - QRinput::estimateBitsMode8($q); // - 4 - l8

+					if($dif < 0) {

+						break;

+					} else {

+						$p = $q;

+					}

+				} else {

+					$p++;

+				}

+			}

 

-            $run = $p;

-            $ret = $this->input->append(QR_MODE_8, $run, str_split($this->dataStr));

+			$run = $p;

+			$ret = $this->input->append(QR_MODE_8, $run, str_split($this->dataStr));

             

-            if($ret < 0)

-                return -1;

+			if($ret < 0)

+				return -1;

 

-            return $run;

-        }

+			return $run;

+		}

 

-        //----------------------------------------------------------------------

-        public function splitString()

-        {

-            while (strlen($this->dataStr) > 0)

-            {

-                if($this->dataStr == '')

-                    return 0;

+		//----------------------------------------------------------------------

+		public function splitString()

+		{

+			while (strlen($this->dataStr) > 0)

+			{

+				if($this->dataStr == '')

+					return 0;

 

-                $mode = $this->identifyMode(0);

+				$mode = $this->identifyMode(0);

                 

-                switch ($mode) {

-                    case QR_MODE_NUM: $length = $this->eatNum(); break;

-                    case QR_MODE_AN:  $length = $this->eatAn(); break;

-                    case QR_MODE_KANJI:

-                        if ($this->modeHint == QR_MODE_KANJI)

-                                $length = $this->eatKanji();

-                        else    $length = $this->eat8();

-                        break;

-                    default: $length = $this->eat8(); break;

+				switch ($mode) {

+					case QR_MODE_NUM: $length = $this->eatNum(); break;

+					case QR_MODE_AN:  $length = $this->eatAn(); break;

+					case QR_MODE_KANJI:

+						if ($this->modeHint == QR_MODE_KANJI)

+								$length = $this->eatKanji();

+						else    $length = $this->eat8();

+						break;

+					default: $length = $this->eat8(); break;

                 

-                }

+				}

 

-                if($length == 0) return 0;

-                if($length < 0)  return -1;

+				if($length == 0) return 0;

+				if($length < 0)  return -1;

                 

-                $this->dataStr = substr($this->dataStr, $length);

-            }

-        }

+				$this->dataStr = substr($this->dataStr, $length);

+			}

+		}

 

-        //----------------------------------------------------------------------

-        public function toUpper()

-        {

-            $stringLen = strlen($this->dataStr);

-            $p = 0;

+		//----------------------------------------------------------------------

+		public function toUpper()

+		{

+			$stringLen = strlen($this->dataStr);

+			$p = 0;

             

-            while ($p<$stringLen) {

-                $mode = self::identifyMode(substr($this->dataStr, $p));

-                if($mode == QR_MODE_KANJI) {

-                    $p += 2;

-                } else {

-                    if (ord($this->dataStr[$p]) >= ord('a') && ord($this->dataStr[$p]) <= ord('z')) {

-                        $this->dataStr[$p] = chr(ord($this->dataStr[$p]) - 32);

-                    }

-                    $p++;

-                }

-            }

+			while ($p<$stringLen) {

+				$mode = self::identifyMode(substr($this->dataStr, $p));

+				if($mode == QR_MODE_KANJI) {

+					$p += 2;

+				} else {

+					if (ord($this->dataStr[$p]) >= ord('a') && ord($this->dataStr[$p]) <= ord('z')) {

+						$this->dataStr[$p] = chr(ord($this->dataStr[$p]) - 32);

+					}

+					$p++;

+				}

+			}

 

-            return $this->dataStr;

-        }

+			return $this->dataStr;

+		}

 

-        //----------------------------------------------------------------------

-        public static function splitStringToQRinput($string, QRinput $input, $modeHint, $casesensitive = true)

-        {

-            if(is_null($string) || $string == '\0' || $string == '') {

-                throw new Exception('empty string!!!');

-            }

+		//----------------------------------------------------------------------

+		public static function splitStringToQRinput($string, QRinput $input, $modeHint, $casesensitive = true)

+		{

+			if(is_null($string) || $string == '\0' || $string == '') {

+				throw new Exception('empty string!!!');

+			}

 

-            $split = new QRsplit($string, $input, $modeHint);

+			$split = new QRsplit($string, $input, $modeHint);

             

-            if(!$casesensitive)

-                $split->toUpper();

+			if(!$casesensitive)

+				$split->toUpper();

                 

-            return $split->splitString();

-        }

-    }
+			return $split->splitString();

+		}

+	}

lib/phpqrcode/qrinput.php

Indentation +619 added lines, -619 removed lines

@@ -25,705 +25,705 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

  */

  

-    define('STRUCTURE_HEADER_BITS',  20);

-    define('MAX_STRUCTURED_SYMBOLS', 16);

+	define('STRUCTURE_HEADER_BITS',  20);

+	define('MAX_STRUCTURED_SYMBOLS', 16);

 

-    class QRinputItem {

+	class QRinputItem {

     

-        public $mode;

-        public $size;

-        public $data;

-        public $bstream;

-

-        public function __construct($mode, $size, $data, $bstream = null) 

-        {

-            $setData = array_slice($data, 0, $size);

+		public $mode;

+		public $size;

+		public $data;

+		public $bstream;

+

+		public function __construct($mode, $size, $data, $bstream = null) 

+		{

+			$setData = array_slice($data, 0, $size);

             

-            if (count($setData) < $size) {

-                $setData = array_merge($setData, array_fill(0,$size-count($setData),0));

-            }

-        

-            if(!QRinput::check($mode, $size, $setData)) {

-                throw new Exception('Error m:'.$mode.',s:'.$size.',d:'.join(',',$setData));

-                return null;

-            }

+			if (count($setData) < $size) {

+				$setData = array_merge($setData, array_fill(0,$size-count($setData),0));

+			}

+        

+			if(!QRinput::check($mode, $size, $setData)) {

+				throw new Exception('Error m:'.$mode.',s:'.$size.',d:'.join(',',$setData));

+				return null;

+			}

             

-            $this->mode = $mode;

-            $this->size = $size;

-            $this->data = $setData;

-            $this->bstream = $bstream;

-        }

-        

-        //----------------------------------------------------------------------

-        public function encodeModeNum($version)

-        {

-            try {

+			$this->mode = $mode;

+			$this->size = $size;

+			$this->data = $setData;

+			$this->bstream = $bstream;

+		}

+        

+		//----------------------------------------------------------------------

+		public function encodeModeNum($version)

+		{

+			try {

             

-                $words = (int)($this->size / 3);

-                $bs = new QRbitstream();

+				$words = (int)($this->size / 3);

+				$bs = new QRbitstream();

                 

-                $val = 0x1;

-                $bs->appendNum(4, $val);

-                $bs->appendNum(QRspec::lengthIndicator(QR_MODE_NUM, $version), $this->size);

-

-                for($i=0; $i<$words; $i++) {

-                    $val  = (ord($this->data[$i*3  ]) - ord('0')) * 100;

-                    $val += (ord($this->data[$i*3+1]) - ord('0')) * 10;

-                    $val += (ord($this->data[$i*3+2]) - ord('0'));

-                    $bs->appendNum(10, $val);

-                }

-

-                if($this->size - $words * 3 == 1) {

-                    $val = ord($this->data[$words*3]) - ord('0');

-                    $bs->appendNum(4, $val);

-                } else if($this->size - $words * 3 == 2) {

-                    $val  = (ord($this->data[$words*3  ]) - ord('0')) * 10;

-                    $val += (ord($this->data[$words*3+1]) - ord('0'));

-                    $bs->appendNum(7, $val);

-                }

-

-                $this->bstream = $bs;

-                return 0;

+				$val = 0x1;

+				$bs->appendNum(4, $val);

+				$bs->appendNum(QRspec::lengthIndicator(QR_MODE_NUM, $version), $this->size);

+

+				for($i=0; $i<$words; $i++) {

+					$val  = (ord($this->data[$i*3  ]) - ord('0')) * 100;

+					$val += (ord($this->data[$i*3+1]) - ord('0')) * 10;

+					$val += (ord($this->data[$i*3+2]) - ord('0'));

+					$bs->appendNum(10, $val);

+				}

+

+				if($this->size - $words * 3 == 1) {

+					$val = ord($this->data[$words*3]) - ord('0');

+					$bs->appendNum(4, $val);

+				} else if($this->size - $words * 3 == 2) {

+					$val  = (ord($this->data[$words*3  ]) - ord('0')) * 10;

+					$val += (ord($this->data[$words*3+1]) - ord('0'));

+					$bs->appendNum(7, $val);

+				}

+

+				$this->bstream = $bs;

+				return 0;

                 

-            } catch (Exception $e) {

-                return -1;

-            }

-        }

-        

-        //----------------------------------------------------------------------

-        public function encodeModeAn($version)

-        {

-            try {

-                $words = (int)($this->size / 2);

-                $bs = new QRbitstream();

+			} catch (Exception $e) {

+				return -1;

+			}

+		}

+        

+		//----------------------------------------------------------------------

+		public function encodeModeAn($version)

+		{

+			try {

+				$words = (int)($this->size / 2);

+				$bs = new QRbitstream();

                 

-                $bs->appendNum(4, 0x02);

-                $bs->appendNum(QRspec::lengthIndicator(QR_MODE_AN, $version), $this->size);

+				$bs->appendNum(4, 0x02);

+				$bs->appendNum(QRspec::lengthIndicator(QR_MODE_AN, $version), $this->size);

 

-                for($i=0; $i<$words; $i++) {

-                    $val  = (int)QRinput::lookAnTable(ord($this->data[$i*2  ])) * 45;

-                    $val += (int)QRinput::lookAnTable(ord($this->data[$i*2+1]));

+				for($i=0; $i<$words; $i++) {

+					$val  = (int)QRinput::lookAnTable(ord($this->data[$i*2  ])) * 45;

+					$val += (int)QRinput::lookAnTable(ord($this->data[$i*2+1]));

 

-                    $bs->appendNum(11, $val);

-                }

+					$bs->appendNum(11, $val);

+				}

 

-                if($this->size & 1) {

-                    $val = QRinput::lookAnTable(ord($this->data[$words * 2]));

-                    $bs->appendNum(6, $val);

-                }

+				if($this->size & 1) {

+					$val = QRinput::lookAnTable(ord($this->data[$words * 2]));

+					$bs->appendNum(6, $val);

+				}

         

-                $this->bstream = $bs;

-                return 0;

+				$this->bstream = $bs;

+				return 0;

             

-            } catch (Exception $e) {

-                return -1;

-            }

-        }

-        

-        //----------------------------------------------------------------------

-        public function encodeMode8($version)

-        {

-            try {

-                $bs = new QRbitstream();

-

-                $bs->appendNum(4, 0x4);

-                $bs->appendNum(QRspec::lengthIndicator(QR_MODE_8, $version), $this->size);

-

-                for($i=0; $i<$this->size; $i++) {

-                    $bs->appendNum(8, ord($this->data[$i]));

-                }

-

-                $this->bstream = $bs;

-                return 0;

+			} catch (Exception $e) {

+				return -1;

+			}

+		}

+        

+		//----------------------------------------------------------------------

+		public function encodeMode8($version)

+		{

+			try {

+				$bs = new QRbitstream();

+

+				$bs->appendNum(4, 0x4);

+				$bs->appendNum(QRspec::lengthIndicator(QR_MODE_8, $version), $this->size);

+

+				for($i=0; $i<$this->size; $i++) {

+					$bs->appendNum(8, ord($this->data[$i]));

+				}

+

+				$this->bstream = $bs;

+				return 0;

             

-            } catch (Exception $e) {

-                return -1;

-            }

-        }

+			} catch (Exception $e) {

+				return -1;

+			}

+		}

         

-        //----------------------------------------------------------------------

-        public function encodeModeKanji($version)

-        {

-            try {

+		//----------------------------------------------------------------------

+		public function encodeModeKanji($version)

+		{

+			try {

 

-                $bs = new QRbitrtream();

+				$bs = new QRbitrtream();

                 

-                $bs->appendNum(4, 0x8);

-                $bs->appendNum(QRspec::lengthIndicator(QR_MODE_KANJI, $version), (int)($this->size / 2));

-

-                for($i=0; $i<$this->size; $i+=2) {

-                    $val = (ord($this->data[$i]) << 8) | ord($this->data[$i+1]);

-                    if($val <= 0x9ffc) {

-                        $val -= 0x8140;

-                    } else {

-                        $val -= 0xc140;

-                    }

+				$bs->appendNum(4, 0x8);

+				$bs->appendNum(QRspec::lengthIndicator(QR_MODE_KANJI, $version), (int)($this->size / 2));

+

+				for($i=0; $i<$this->size; $i+=2) {

+					$val = (ord($this->data[$i]) << 8) | ord($this->data[$i+1]);

+					if($val <= 0x9ffc) {

+						$val -= 0x8140;

+					} else {

+						$val -= 0xc140;

+					}

                     

-                    $h = ($val >> 8) * 0xc0;

-                    $val = ($val & 0xff) + $h;

+					$h = ($val >> 8) * 0xc0;

+					$val = ($val & 0xff) + $h;

 

-                    $bs->appendNum(13, $val);

-                }

+					$bs->appendNum(13, $val);

+				}

 

-                $this->bstream = $bs;

-                return 0;

+				$this->bstream = $bs;

+				return 0;

             

-            } catch (Exception $e) {

-                return -1;

-            }

-        }

-

-        //----------------------------------------------------------------------

-        public function encodeModeStructure()

-        {

-            try {

-                $bs =  new QRbitstream();

+			} catch (Exception $e) {

+				return -1;

+			}

+		}

+

+		//----------------------------------------------------------------------

+		public function encodeModeStructure()

+		{

+			try {

+				$bs =  new QRbitstream();

                 

-                $bs->appendNum(4, 0x03);

-                $bs->appendNum(4, ord($this->data[1]) - 1);

-                $bs->appendNum(4, ord($this->data[0]) - 1);

-                $bs->appendNum(8, ord($this->data[2]));

+				$bs->appendNum(4, 0x03);

+				$bs->appendNum(4, ord($this->data[1]) - 1);

+				$bs->appendNum(4, ord($this->data[0]) - 1);

+				$bs->appendNum(8, ord($this->data[2]));

 

-                $this->bstream = $bs;

-                return 0;

+				$this->bstream = $bs;

+				return 0;

             

-            } catch (Exception $e) {

-                return -1;

-            }

-        }

-        

-        //----------------------------------------------------------------------

-        public function estimateBitStreamSizeOfEntry($version)

-        {

-            $bits = 0;

-

-            if($version == 0) 

-                $version = 1;

-

-            switch($this->mode) {

-                case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size);    break;

-                case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size);    break;

-                case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size);    break;

-                case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size);break;

-                case QR_MODE_STRUCTURE:    return STRUCTURE_HEADER_BITS;            

-                default:

-                    return 0;

-            }

-

-            $l = QRspec::lengthIndicator($this->mode, $version);

-            $m = 1 << $l;

-            $num = (int)(($this->size + $m - 1) / $m);

-

-            $bits += $num * (4 + $l);

-

-            return $bits;

-        }

-        

-        //----------------------------------------------------------------------

-        public function encodeBitStream($version)

-        {

-            try {

+			} catch (Exception $e) {

+				return -1;

+			}

+		}

+        

+		//----------------------------------------------------------------------

+		public function estimateBitStreamSizeOfEntry($version)

+		{

+			$bits = 0;

+

+			if($version == 0) 

+				$version = 1;

+

+			switch($this->mode) {

+				case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size);    break;

+				case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size);    break;

+				case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size);    break;

+				case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size);break;

+				case QR_MODE_STRUCTURE:    return STRUCTURE_HEADER_BITS;            

+				default:

+					return 0;

+			}

+

+			$l = QRspec::lengthIndicator($this->mode, $version);

+			$m = 1 << $l;

+			$num = (int)(($this->size + $m - 1) / $m);

+

+			$bits += $num * (4 + $l);

+

+			return $bits;

+		}

+        

+		//----------------------------------------------------------------------

+		public function encodeBitStream($version)

+		{

+			try {

             

-                unset($this->bstream);

-                $words = QRspec::maximumWords($this->mode, $version);

+				unset($this->bstream);

+				$words = QRspec::maximumWords($this->mode, $version);

                 

-                if($this->size > $words) {

+				if($this->size > $words) {

                 

-                    $st1 = new QRinputItem($this->mode, $words, $this->data);

-                    $st2 = new QRinputItem($this->mode, $this->size - $words, array_slice($this->data, $words));

+					$st1 = new QRinputItem($this->mode, $words, $this->data);

+					$st2 = new QRinputItem($this->mode, $this->size - $words, array_slice($this->data, $words));

 

-                    $st1->encodeBitStream($version);

-                    $st2->encodeBitStream($version);

+					$st1->encodeBitStream($version);

+					$st2->encodeBitStream($version);

                     

-                    $this->bstream = new QRbitstream();

-                    $this->bstream->append($st1->bstream);

-                    $this->bstream->append($st2->bstream);

+					$this->bstream = new QRbitstream();

+					$this->bstream->append($st1->bstream);

+					$this->bstream->append($st2->bstream);

                     

-                    unset($st1);

-                    unset($st2);

+					unset($st1);

+					unset($st2);

                     

-                } else {

+				} else {

                     

-                    $ret = 0;

+					$ret = 0;

                     

-                    switch($this->mode) {

-                        case QR_MODE_NUM:        $ret = $this->encodeModeNum($version);    break;

-                        case QR_MODE_AN:        $ret = $this->encodeModeAn($version);    break;

-                        case QR_MODE_8:            $ret = $this->encodeMode8($version);    break;

-                        case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version);break;

-                        case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure();    break;

+					switch($this->mode) {

+						case QR_MODE_NUM:        $ret = $this->encodeModeNum($version);    break;

+						case QR_MODE_AN:        $ret = $this->encodeModeAn($version);    break;

+						case QR_MODE_8:            $ret = $this->encodeMode8($version);    break;

+						case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version);break;

+						case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure();    break;

                         

-                        default:

-                            break;

-                    }

+						default:

+							break;

+					}

                     

-                    if($ret < 0)

-                        return -1;

-                }

+					if($ret < 0)

+						return -1;

+				}

 

-                return $this->bstream->size();

+				return $this->bstream->size();

             

-            } catch (Exception $e) {

-                return -1;

-            }

-        }

-    };

+			} catch (Exception $e) {

+				return -1;

+			}

+		}

+	};

     

-    //##########################################################################

+	//##########################################################################

 

-    class QRinput {

+	class QRinput {

 

-        public $items;

+		public $items;

         

-        private $version;

-        private $level;

+		private $version;

+		private $level;

         

-        //----------------------------------------------------------------------

-        public function __construct($version = 0, $level = QR_ECLEVEL_L)

-        {

-            if ($version < 0 || $version > QRSPEC_VERSION_MAX || $level > QR_ECLEVEL_H) {

-                throw new Exception('Invalid version no');

-                return NULL;

-            }

+		//----------------------------------------------------------------------

+		public function __construct($version = 0, $level = QR_ECLEVEL_L)

+		{

+			if ($version < 0 || $version > QRSPEC_VERSION_MAX || $level > QR_ECLEVEL_H) {

+				throw new Exception('Invalid version no');

+				return NULL;

+			}

             

-            $this->version = $version;

-            $this->level = $level;

-        }

-        

-        //----------------------------------------------------------------------

-        public function getVersion()

-        {

-            return $this->version;

-        }

-        

-        //----------------------------------------------------------------------

-        public function setVersion($version)

-        {

-            if($version < 0 || $version > QRSPEC_VERSION_MAX) {

-                throw new Exception('Invalid version no');

-                return -1;

-            }

-

-            $this->version = $version;

-

-            return 0;

-        }

-        

-        //----------------------------------------------------------------------

-        public function getErrorCorrectionLevel()

-        {

-            return $this->level;

-        }

-

-        //----------------------------------------------------------------------

-        public function setErrorCorrectionLevel($level)

-        {

-            if($level > QR_ECLEVEL_H) {

-                throw new Exception('Invalid ECLEVEL');

-                return -1;

-            }

-

-            $this->level = $level;

-

-            return 0;

-        }

-        

-        //----------------------------------------------------------------------

-        public function appendEntry(QRinputItem $entry)

-        {

-            $this->items[] = $entry;

-        }

-        

-        //----------------------------------------------------------------------

-        public function append($mode, $size, $data)

-        {

-            try {

-                $entry = new QRinputItem($mode, $size, $data);

-                $this->items[] = $entry;

-                return 0;

-            } catch (Exception $e) {

-                return -1;

-            }

-        }

-        

-        //----------------------------------------------------------------------

-        

-        public function insertStructuredAppendHeader($size, $index, $parity)

-        {

-            if( $size > MAX_STRUCTURED_SYMBOLS ) {

-                throw new Exception('insertStructuredAppendHeader wrong size');

-            }

+			$this->version = $version;

+			$this->level = $level;

+		}

+        

+		//----------------------------------------------------------------------

+		public function getVersion()

+		{

+			return $this->version;

+		}

+        

+		//----------------------------------------------------------------------

+		public function setVersion($version)

+		{

+			if($version < 0 || $version > QRSPEC_VERSION_MAX) {

+				throw new Exception('Invalid version no');

+				return -1;

+			}

+

+			$this->version = $version;

+

+			return 0;

+		}

+        

+		//----------------------------------------------------------------------

+		public function getErrorCorrectionLevel()

+		{

+			return $this->level;

+		}

+

+		//----------------------------------------------------------------------

+		public function setErrorCorrectionLevel($level)

+		{

+			if($level > QR_ECLEVEL_H) {

+				throw new Exception('Invalid ECLEVEL');

+				return -1;

+			}

+

+			$this->level = $level;

+

+			return 0;

+		}

+        

+		//----------------------------------------------------------------------

+		public function appendEntry(QRinputItem $entry)

+		{

+			$this->items[] = $entry;

+		}

+        

+		//----------------------------------------------------------------------

+		public function append($mode, $size, $data)

+		{

+			try {

+				$entry = new QRinputItem($mode, $size, $data);

+				$this->items[] = $entry;

+				return 0;

+			} catch (Exception $e) {

+				return -1;

+			}

+		}

+        

+		//----------------------------------------------------------------------

+        

+		public function insertStructuredAppendHeader($size, $index, $parity)

+		{

+			if( $size > MAX_STRUCTURED_SYMBOLS ) {

+				throw new Exception('insertStructuredAppendHeader wrong size');

+			}

             

-            if( $index <= 0 || $index > MAX_STRUCTURED_SYMBOLS ) {

-                throw new Exception('insertStructuredAppendHeader wrong index');

-            }

+			if( $index <= 0 || $index > MAX_STRUCTURED_SYMBOLS ) {

+				throw new Exception('insertStructuredAppendHeader wrong index');

+			}

 

-            $buf = array($size, $index, $parity);

+			$buf = array($size, $index, $parity);

             

-            try {

-                $entry = new QRinputItem(QR_MODE_STRUCTURE, 3, buf);

-                array_unshift($this->items, $entry);

-                return 0;

-            } catch (Exception $e) {

-                return -1;

-            }

-        }

-

-        //----------------------------------------------------------------------

-        public function calcParity()

-        {

-            $parity = 0;

+			try {

+				$entry = new QRinputItem(QR_MODE_STRUCTURE, 3, buf);

+				array_unshift($this->items, $entry);

+				return 0;

+			} catch (Exception $e) {

+				return -1;

+			}

+		}

+

+		//----------------------------------------------------------------------

+		public function calcParity()

+		{

+			$parity = 0;

             

-            foreach($this->items as $item) {

-                if($item->mode != QR_MODE_STRUCTURE) {

-                    for($i=$item->size-1; $i>=0; $i--) {

-                        $parity ^= $item->data[$i];

-                    }

-                }

-            }

-

-            return $parity;

-        }

-        

-        //----------------------------------------------------------------------

-        public static function checkModeNum($size, $data)

-        {

-            for($i=0; $i<$size; $i++) {

-                if((ord($data[$i]) < ord('0')) || (ord($data[$i]) > ord('9'))){

-                    return false;

-                }

-            }

-

-            return true;

-        }

-

-        //----------------------------------------------------------------------

-        public static function estimateBitsModeNum($size)

-        {

-            $w = (int)$size / 3;

-            $bits = $w * 10;

+			foreach($this->items as $item) {

+				if($item->mode != QR_MODE_STRUCTURE) {

+					for($i=$item->size-1; $i>=0; $i--) {

+						$parity ^= $item->data[$i];

+					}

+				}

+			}

+

+			return $parity;

+		}

+        

+		//----------------------------------------------------------------------

+		public static function checkModeNum($size, $data)

+		{

+			for($i=0; $i<$size; $i++) {

+				if((ord($data[$i]) < ord('0')) || (ord($data[$i]) > ord('9'))){

+					return false;

+				}

+			}

+

+			return true;

+		}

+

+		//----------------------------------------------------------------------

+		public static function estimateBitsModeNum($size)

+		{

+			$w = (int)$size / 3;

+			$bits = $w * 10;

             

-            switch($size - $w * 3) {

-                case 1:

-                    $bits += 4;

-                    break;

-                case 2:

-                    $bits += 7;

-                    break;

-                default:

-                    break;

-            }

-

-            return $bits;

-        }

-        

-        //----------------------------------------------------------------------

-        public static $anTable = array(

-            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

-            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

-            36, -1, -1, -1, 37, 38, -1, -1, -1, -1, 39, 40, -1, 41, 42, 43,

-             0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 44, -1, -1, -1, -1, -1,

-            -1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,

-            25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1,

-            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

-            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1

-        );

-        

-        //----------------------------------------------------------------------

-        public static function lookAnTable($c)

-        {

-            return (($c > 127)?-1:self::$anTable[$c]);

-        }

-        

-        //----------------------------------------------------------------------

-        public static function checkModeAn($size, $data)

-        {

-            for($i=0; $i<$size; $i++) {

-                if (self::lookAnTable(ord($data[$i])) == -1) {

-                    return false;

-                }

-            }

-

-            return true;

-        }

-        

-        //----------------------------------------------------------------------

-        public static function estimateBitsModeAn($size)

-        {

-            $w = (int)($size / 2);

-            $bits = $w * 11;

+			switch($size - $w * 3) {

+				case 1:

+					$bits += 4;

+					break;

+				case 2:

+					$bits += 7;

+					break;

+				default:

+					break;

+			}

+

+			return $bits;

+		}

+        

+		//----------------------------------------------------------------------

+		public static $anTable = array(

+			-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

+			-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

+			36, -1, -1, -1, 37, 38, -1, -1, -1, -1, 39, 40, -1, 41, 42, 43,

+			 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 44, -1, -1, -1, -1, -1,

+			-1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,

+			25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1,

+			-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

+			-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1

+		);

+        

+		//----------------------------------------------------------------------

+		public static function lookAnTable($c)

+		{

+			return (($c > 127)?-1:self::$anTable[$c]);

+		}

+        

+		//----------------------------------------------------------------------

+		public static function checkModeAn($size, $data)

+		{

+			for($i=0; $i<$size; $i++) {

+				if (self::lookAnTable(ord($data[$i])) == -1) {

+					return false;

+				}

+			}

+

+			return true;

+		}

+        

+		//----------------------------------------------------------------------

+		public static function estimateBitsModeAn($size)

+		{

+			$w = (int)($size / 2);

+			$bits = $w * 11;

             

-            if($size & 1) {

-                $bits += 6;

-            }

+			if($size & 1) {

+				$bits += 6;

+			}

 

-            return $bits;

-        }

+			return $bits;

+		}

     

-        //----------------------------------------------------------------------

-        public static function estimateBitsMode8($size)

-        {

-            return $size * 8;

-        }

-        

-        //----------------------------------------------------------------------

-        public function estimateBitsModeKanji($size)

-        {

-            return (int)(($size / 2) * 13);

-        }

-        

-        //----------------------------------------------------------------------

-        public static function checkModeKanji($size, $data)

-        {

-            if($size & 1)

-                return false;

-

-            for($i=0; $i<$size; $i+=2) {

-                $val = (ord($data[$i]) << 8) | ord($data[$i+1]);

-                if( $val < 0x8140 

-                || ($val > 0x9ffc && $val < 0xe040) 

-                || $val > 0xebbf) {

-                    return false;

-                }

-            }

-

-            return true;

-        }

-

-        /***********************************************************************

+		//----------------------------------------------------------------------

+		public static function estimateBitsMode8($size)

+		{

+			return $size * 8;

+		}

+        

+		//----------------------------------------------------------------------

+		public function estimateBitsModeKanji($size)

+		{

+			return (int)(($size / 2) * 13);

+		}

+        

+		//----------------------------------------------------------------------

+		public static function checkModeKanji($size, $data)

+		{

+			if($size & 1)

+				return false;

+

+			for($i=0; $i<$size; $i+=2) {

+				$val = (ord($data[$i]) << 8) | ord($data[$i+1]);

+				if( $val < 0x8140 

+				|| ($val > 0x9ffc && $val < 0xe040) 

+				|| $val > 0xebbf) {

+					return false;

+				}

+			}

+

+			return true;

+		}

+

+		/***********************************************************************

          * Validation

          **********************************************************************/

 

-        public static function check($mode, $size, $data)

-        {

-            if($size <= 0) 

-                return false;

-

-            switch($mode) {

-                case QR_MODE_NUM:       return self::checkModeNum($size, $data);   break;

-                case QR_MODE_AN:        return self::checkModeAn($size, $data);    break;

-                case QR_MODE_KANJI:     return self::checkModeKanji($size, $data); break;

-                case QR_MODE_8:         return true; break;

-                case QR_MODE_STRUCTURE: return true; break;

+		public static function check($mode, $size, $data)

+		{

+			if($size <= 0) 

+				return false;

+

+			switch($mode) {

+				case QR_MODE_NUM:       return self::checkModeNum($size, $data);   break;

+				case QR_MODE_AN:        return self::checkModeAn($size, $data);    break;

+				case QR_MODE_KANJI:     return self::checkModeKanji($size, $data); break;

+				case QR_MODE_8:         return true; break;

+				case QR_MODE_STRUCTURE: return true; break;

                 

-                default:

-                    break;

-            }

-

-            return false;

-        }

-        

-        

-        //----------------------------------------------------------------------

-        public function estimateBitStreamSize($version)

-        {

-            $bits = 0;

-

-            foreach($this->items as $item) {

-                $bits += $item->estimateBitStreamSizeOfEntry($version);

-            }

-

-            return $bits;

-        }

-        

-        //----------------------------------------------------------------------

-        public function estimateVersion()

-        {

-            $version = 0;

-            $prev = 0;

-            do {

-                $prev = $version;

-                $bits = $this->estimateBitStreamSize($prev);

-                $version = QRspec::getMinimumVersion((int)(($bits + 7) / 8), $this->level);

-                if ($version < 0) {

-                    return -1;

-                }

-            } while ($version > $prev);

-

-            return $version;

-        }

-        

-        //----------------------------------------------------------------------

-        public static function lengthOfCode($mode, $version, $bits)

-        {

-            $payload = $bits - 4 - QRspec::lengthIndicator($mode, $version);

-            switch($mode) {

-                case QR_MODE_NUM:

-                    $chunks = (int)($payload / 10);

-                    $remain = $payload - $chunks * 10;

-                    $size = $chunks * 3;

-                    if($remain >= 7) {

-                        $size += 2;

-                    } else if($remain >= 4) {

-                        $size += 1;

-                    }

-                    break;

-                case QR_MODE_AN:

-                    $chunks = (int)($payload / 11);

-                    $remain = $payload - $chunks * 11;

-                    $size = $chunks * 2;

-                    if($remain >= 6) 

-                        $size++;

-                    break;

-                case QR_MODE_8:

-                    $size = (int)($payload / 8);

-                    break;

-                case QR_MODE_KANJI:

-                    $size = (int)(($payload / 13) * 2);

-                    break;

-                case QR_MODE_STRUCTURE:

-                    $size = (int)($payload / 8);

-                    break;

-                default:

-                    $size = 0;

-                    break;

-            }

+				default:

+					break;

+			}

+

+			return false;

+		}

+        

+        

+		//----------------------------------------------------------------------

+		public function estimateBitStreamSize($version)

+		{

+			$bits = 0;

+

+			foreach($this->items as $item) {

+				$bits += $item->estimateBitStreamSizeOfEntry($version);

+			}

+

+			return $bits;

+		}

+        

+		//----------------------------------------------------------------------

+		public function estimateVersion()

+		{

+			$version = 0;

+			$prev = 0;

+			do {

+				$prev = $version;

+				$bits = $this->estimateBitStreamSize($prev);

+				$version = QRspec::getMinimumVersion((int)(($bits + 7) / 8), $this->level);

+				if ($version < 0) {

+					return -1;

+				}

+			} while ($version > $prev);

+

+			return $version;

+		}

+        

+		//----------------------------------------------------------------------

+		public static function lengthOfCode($mode, $version, $bits)

+		{

+			$payload = $bits - 4 - QRspec::lengthIndicator($mode, $version);

+			switch($mode) {

+				case QR_MODE_NUM:

+					$chunks = (int)($payload / 10);

+					$remain = $payload - $chunks * 10;

+					$size = $chunks * 3;

+					if($remain >= 7) {

+						$size += 2;

+					} else if($remain >= 4) {

+						$size += 1;

+					}

+					break;

+				case QR_MODE_AN:

+					$chunks = (int)($payload / 11);

+					$remain = $payload - $chunks * 11;

+					$size = $chunks * 2;

+					if($remain >= 6) 

+						$size++;

+					break;

+				case QR_MODE_8:

+					$size = (int)($payload / 8);

+					break;

+				case QR_MODE_KANJI:

+					$size = (int)(($payload / 13) * 2);

+					break;

+				case QR_MODE_STRUCTURE:

+					$size = (int)($payload / 8);

+					break;

+				default:

+					$size = 0;

+					break;

+			}

             

-            $maxsize = QRspec::maximumWords($mode, $version);

-            if($size < 0) $size = 0;

-            if($size > $maxsize) $size = $maxsize;

+			$maxsize = QRspec::maximumWords($mode, $version);

+			if($size < 0) $size = 0;

+			if($size > $maxsize) $size = $maxsize;

 

-            return $size;

-        }

+			return $size;

+		}

         

-        //----------------------------------------------------------------------

-        public function createBitStream()

-        {

-            $total = 0;

+		//----------------------------------------------------------------------

+		public function createBitStream()

+		{

+			$total = 0;

 

-            foreach($this->items as $item) {

-                $bits = $item->encodeBitStream($this->version);

+			foreach($this->items as $item) {

+				$bits = $item->encodeBitStream($this->version);

                 

-                if($bits < 0) 

-                    return -1;

+				if($bits < 0) 

+					return -1;

                     

-                $total += $bits;

-            }

-

-            return $total;

-        }

-        

-        //----------------------------------------------------------------------

-        public function convertData()

-        {

-            $ver = $this->estimateVersion();

-            if($ver > $this->getVersion()) {

-                $this->setVersion($ver);

-            }

-

-            for(;;) {

-                $bits = $this->createBitStream();

+				$total += $bits;

+			}

+

+			return $total;

+		}

+        

+		//----------------------------------------------------------------------

+		public function convertData()

+		{

+			$ver = $this->estimateVersion();

+			if($ver > $this->getVersion()) {

+				$this->setVersion($ver);

+			}

+

+			for(;;) {

+				$bits = $this->createBitStream();

                 

-                if($bits < 0) 

-                    return -1;

+				if($bits < 0) 

+					return -1;

                     

-                $ver = QRspec::getMinimumVersion((int)(($bits + 7) / 8), $this->level);

-                if($ver < 0) {

-                    throw new Exception('WRONG VERSION');

-                    return -1;

-                } else if($ver > $this->getVersion()) {

-                    $this->setVersion($ver);

-                } else {

-                    break;

-                }

-            }

-

-            return 0;

-        }

-        

-        //----------------------------------------------------------------------

-        public function appendPaddingBit(&$bstream)

-        {

-            $bits = $bstream->size();

-            $maxwords = QRspec::getDataLength($this->version, $this->level);

-            $maxbits = $maxwords * 8;

-

-            if ($maxbits == $bits) {

-                return 0;

-            }

-

-            if ($maxbits - $bits < 5) {

-                return $bstream->appendNum($maxbits - $bits, 0);

-            }

-

-            $bits += 4;

-            $words = (int)(($bits + 7) / 8);

-

-            $padding = new QRbitstream();

-            $ret = $padding->appendNum($words * 8 - $bits + 4, 0);

+				$ver = QRspec::getMinimumVersion((int)(($bits + 7) / 8), $this->level);

+				if($ver < 0) {

+					throw new Exception('WRONG VERSION');

+					return -1;

+				} else if($ver > $this->getVersion()) {

+					$this->setVersion($ver);

+				} else {

+					break;

+				}

+			}

+

+			return 0;

+		}

+        

+		//----------------------------------------------------------------------

+		public function appendPaddingBit(&$bstream)

+		{

+			$bits = $bstream->size();

+			$maxwords = QRspec::getDataLength($this->version, $this->level);

+			$maxbits = $maxwords * 8;

+

+			if ($maxbits == $bits) {

+				return 0;

+			}

+

+			if ($maxbits - $bits < 5) {

+				return $bstream->appendNum($maxbits - $bits, 0);

+			}

+

+			$bits += 4;

+			$words = (int)(($bits + 7) / 8);

+

+			$padding = new QRbitstream();

+			$ret = $padding->appendNum($words * 8 - $bits + 4, 0);

             

-            if($ret < 0) 

-                return $ret;

+			if($ret < 0) 

+				return $ret;

 

-            $padlen = $maxwords - $words;

+			$padlen = $maxwords - $words;

             

-            if($padlen > 0) {

+			if($padlen > 0) {

                 

-                $padbuf = array();

-                for($i=0; $i<$padlen; $i++) {

-                    $padbuf[$i] = ($i&1)?0x11:0xec;

-                }

+				$padbuf = array();

+				for($i=0; $i<$padlen; $i++) {

+					$padbuf[$i] = ($i&1)?0x11:0xec;

+				}

                 

-                $ret = $padding->appendBytes($padlen, $padbuf);

+				$ret = $padding->appendBytes($padlen, $padbuf);

                 

-                if($ret < 0)

-                    return $ret;

+				if($ret < 0)

+					return $ret;

                 

-            }

+			}

 

-            $ret = $bstream->append($padding);

+			$ret = $bstream->append($padding);

             

-            return $ret;

-        }

+			return $ret;

+		}

 

-        //----------------------------------------------------------------------

-        public function mergeBitStream()

-        {

-            if($this->convertData() < 0) {

-                return null;

-            }

+		//----------------------------------------------------------------------

+		public function mergeBitStream()

+		{

+			if($this->convertData() < 0) {

+				return null;

+			}

 

-            $bstream = new QRbitstream();

+			$bstream = new QRbitstream();

             

-            foreach($this->items as $item) {

-                $ret = $bstream->append($item->bstream);

-                if($ret < 0) {

-                    return null;

-                }

-            }

+			foreach($this->items as $item) {

+				$ret = $bstream->append($item->bstream);

+				if($ret < 0) {

+					return null;

+				}

+			}

 

-            return $bstream;

-        }

+			return $bstream;

+		}

 

-        //----------------------------------------------------------------------

-        public function getBitStream()

-        {

+		//----------------------------------------------------------------------

+		public function getBitStream()

+		{

 

-            $bstream = $this->mergeBitStream();

+			$bstream = $this->mergeBitStream();

             

-            if($bstream == null) {

-                return null;

-            }

+			if($bstream == null) {

+				return null;

+			}

             

-            $ret = $this->appendPaddingBit($bstream);

-            if($ret < 0) {

-                return null;

-            }

-

-            return $bstream;

-        }

-        

-        //----------------------------------------------------------------------

-        public function getByteStream()

-        {

-            $bstream = $this->getBitStream();

-            if($bstream == null) {

-                return null;

-            }

+			$ret = $this->appendPaddingBit($bstream);

+			if($ret < 0) {

+				return null;

+			}

+

+			return $bstream;

+		}

+        

+		//----------------------------------------------------------------------

+		public function getByteStream()

+		{

+			$bstream = $this->getBitStream();

+			if($bstream == null) {

+				return null;

+			}

             

-            return $bstream->toByte();

-        }

-    }

+			return $bstream->toByte();

+		}

+	}

         

         

-    
\ No newline at end of file
+	
\ No newline at end of file

lib/phpqrcode/qrencode.php

Indentation +381 added lines, -381 removed lines

@@ -25,478 +25,478 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

  */

  

-    class QRrsblock {

-        public $dataLength;

-        public $data = array();

-        public $eccLength;

-        public $ecc = array();

+	class QRrsblock {

+		public $dataLength;

+		public $data = array();

+		public $eccLength;

+		public $ecc = array();

         

-        public function __construct($dl, $data, $el, &$ecc, QRrsItem $rs)

-        {

-            $rs->encode_rs_char($data, $ecc);

+		public function __construct($dl, $data, $el, &$ecc, QRrsItem $rs)

+		{

+			$rs->encode_rs_char($data, $ecc);

         

-            $this->dataLength = $dl;

-            $this->data = $data;

-            $this->eccLength = $el;

-            $this->ecc = $ecc;

-        }

-    };

+			$this->dataLength = $dl;

+			$this->data = $data;

+			$this->eccLength = $el;

+			$this->ecc = $ecc;

+		}

+	};

     

-    //##########################################################################

+	//##########################################################################

 

-    class QRrawcode {

-        public $version;

-        public $datacode = array();

-        public $ecccode = array();

-        public $blocks;

-        public $rsblocks = array(); //of RSblock

-        public $count;

-        public $dataLength;

-        public $eccLength;

-        public $b1;

+	class QRrawcode {

+		public $version;

+		public $datacode = array();

+		public $ecccode = array();

+		public $blocks;

+		public $rsblocks = array(); //of RSblock

+		public $count;

+		public $dataLength;

+		public $eccLength;

+		public $b1;

         

-        //----------------------------------------------------------------------

-        public function __construct(QRinput $input)

-        {

-            $spec = array(0,0,0,0,0);

+		//----------------------------------------------------------------------

+		public function __construct(QRinput $input)

+		{

+			$spec = array(0,0,0,0,0);

             

-            $this->datacode = $input->getByteStream();

-            if(is_null($this->datacode)) {

-                throw new Exception('null imput string');

-            }

+			$this->datacode = $input->getByteStream();

+			if(is_null($this->datacode)) {

+				throw new Exception('null imput string');

+			}

 

-            QRspec::getEccSpec($input->getVersion(), $input->getErrorCorrectionLevel(), $spec);

+			QRspec::getEccSpec($input->getVersion(), $input->getErrorCorrectionLevel(), $spec);

 

-            $this->version = $input->getVersion();

-            $this->b1 = QRspec::rsBlockNum1($spec);

-            $this->dataLength = QRspec::rsDataLength($spec);

-            $this->eccLength = QRspec::rsEccLength($spec);

-            $this->ecccode = array_fill(0, $this->eccLength, 0);

-            $this->blocks = QRspec::rsBlockNum($spec);

+			$this->version = $input->getVersion();

+			$this->b1 = QRspec::rsBlockNum1($spec);

+			$this->dataLength = QRspec::rsDataLength($spec);

+			$this->eccLength = QRspec::rsEccLength($spec);

+			$this->ecccode = array_fill(0, $this->eccLength, 0);

+			$this->blocks = QRspec::rsBlockNum($spec);

             

-            $ret = $this->init($spec);

-            if($ret < 0) {

-                throw new Exception('block alloc error');

-                return null;

-            }

+			$ret = $this->init($spec);

+			if($ret < 0) {

+				throw new Exception('block alloc error');

+				return null;

+			}

 

-            $this->count = 0;

-        }

+			$this->count = 0;

+		}

         

-        //----------------------------------------------------------------------

-        public function init(array $spec)

-        {

-            $dl = QRspec::rsDataCodes1($spec);

-            $el = QRspec::rsEccCodes1($spec);

-            $rs = QRrs::init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el);

+		//----------------------------------------------------------------------

+		public function init(array $spec)

+		{

+			$dl = QRspec::rsDataCodes1($spec);

+			$el = QRspec::rsEccCodes1($spec);

+			$rs = QRrs::init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el);

             

 

-            $blockNo = 0;

-            $dataPos = 0;

-            $eccPos = 0;

-            for($i=0; $i<QRspec::rsBlockNum1($spec); $i++) {

-                $ecc = array_slice($this->ecccode,$eccPos);

-                $this->rsblocks[$blockNo] = new QRrsblock($dl, array_slice($this->datacode, $dataPos), $el,  $ecc, $rs);

-                $this->ecccode = array_merge(array_slice($this->ecccode,0, $eccPos), $ecc);

+			$blockNo = 0;

+			$dataPos = 0;

+			$eccPos = 0;

+			for($i=0; $i<QRspec::rsBlockNum1($spec); $i++) {

+				$ecc = array_slice($this->ecccode,$eccPos);

+				$this->rsblocks[$blockNo] = new QRrsblock($dl, array_slice($this->datacode, $dataPos), $el,  $ecc, $rs);

+				$this->ecccode = array_merge(array_slice($this->ecccode,0, $eccPos), $ecc);

                 

-                $dataPos += $dl;

-                $eccPos += $el;

-                $blockNo++;

-            }

+				$dataPos += $dl;

+				$eccPos += $el;

+				$blockNo++;

+			}

 

-            if(QRspec::rsBlockNum2($spec) == 0)

-                return 0;

+			if(QRspec::rsBlockNum2($spec) == 0)

+				return 0;

 

-            $dl = QRspec::rsDataCodes2($spec);

-            $el = QRspec::rsEccCodes2($spec);

-            $rs = QRrs::init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el);

+			$dl = QRspec::rsDataCodes2($spec);

+			$el = QRspec::rsEccCodes2($spec);

+			$rs = QRrs::init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el);

             

-            if($rs == NULL) return -1;

+			if($rs == NULL) return -1;

             

-            for($i=0; $i<QRspec::rsBlockNum2($spec); $i++) {

-                $ecc = array_slice($this->ecccode,$eccPos);

-                $this->rsblocks[$blockNo] = new QRrsblock($dl, array_slice($this->datacode, $dataPos), $el, $ecc, $rs);

-                $this->ecccode = array_merge(array_slice($this->ecccode,0, $eccPos), $ecc);

+			for($i=0; $i<QRspec::rsBlockNum2($spec); $i++) {

+				$ecc = array_slice($this->ecccode,$eccPos);

+				$this->rsblocks[$blockNo] = new QRrsblock($dl, array_slice($this->datacode, $dataPos), $el, $ecc, $rs);

+				$this->ecccode = array_merge(array_slice($this->ecccode,0, $eccPos), $ecc);

                 

-                $dataPos += $dl;

-                $eccPos += $el;

-                $blockNo++;

-            }

+				$dataPos += $dl;

+				$eccPos += $el;

+				$blockNo++;

+			}

 

-            return 0;

-        }

+			return 0;

+		}

         

-        //----------------------------------------------------------------------

-        public function getCode()

-        {

-            $ret = 0;

+		//----------------------------------------------------------------------

+		public function getCode()

+		{

+			$ret = 0;

 

-            if($this->count < $this->dataLength) {

-                $row = $this->count % $this->blocks;

-                $col = $this->count / $this->blocks;

-                if($col >= $this->rsblocks[0]->dataLength) {

-                    $row += $this->b1;

-                }

-                $ret = $this->rsblocks[$row]->data[$col];

-            } else if($this->count < $this->dataLength + $this->eccLength) {

-                $row = ($this->count - $this->dataLength) % $this->blocks;

-                $col = ($this->count - $this->dataLength) / $this->blocks;

-                $ret = $this->rsblocks[$row]->ecc[$col];

-            } else {

-                return 0;

-            }

-            $this->count++;

+			if($this->count < $this->dataLength) {

+				$row = $this->count % $this->blocks;

+				$col = $this->count / $this->blocks;

+				if($col >= $this->rsblocks[0]->dataLength) {

+					$row += $this->b1;

+				}

+				$ret = $this->rsblocks[$row]->data[$col];

+			} else if($this->count < $this->dataLength + $this->eccLength) {

+				$row = ($this->count - $this->dataLength) % $this->blocks;

+				$col = ($this->count - $this->dataLength) / $this->blocks;

+				$ret = $this->rsblocks[$row]->ecc[$col];

+			} else {

+				return 0;

+			}

+			$this->count++;

             

-            return $ret;

-        }

-    }

+			return $ret;

+		}

+	}

 

-    //##########################################################################

+	//##########################################################################

     

-    class QRcode {

+	class QRcode {

     

-        public $version;

-        public $width;

-        public $data; 

+		public $version;

+		public $width;

+		public $data; 

         

-        //----------------------------------------------------------------------

-        public function encodeMask(QRinput $input, $mask)

-        {

-            if($input->getVersion() < 0 || $input->getVersion() > QRSPEC_VERSION_MAX) {

-                throw new Exception('wrong version');

-            }

-            if($input->getErrorCorrectionLevel() > QR_ECLEVEL_H) {

-                throw new Exception('wrong level');

-            }

+		//----------------------------------------------------------------------

+		public function encodeMask(QRinput $input, $mask)

+		{

+			if($input->getVersion() < 0 || $input->getVersion() > QRSPEC_VERSION_MAX) {

+				throw new Exception('wrong version');

+			}

+			if($input->getErrorCorrectionLevel() > QR_ECLEVEL_H) {

+				throw new Exception('wrong level');

+			}

 

-            $raw = new QRrawcode($input);

+			$raw = new QRrawcode($input);

             

-            QRtools::markTime('after_raw');

+			QRtools::markTime('after_raw');

             

-            $version = $raw->version;

-            $width = QRspec::getWidth($version);

-            $frame = QRspec::newFrame($version);

+			$version = $raw->version;

+			$width = QRspec::getWidth($version);

+			$frame = QRspec::newFrame($version);

             

-            $filler = new FrameFiller($width, $frame);

-            if(is_null($filler)) {

-                return NULL;

-            }

+			$filler = new FrameFiller($width, $frame);

+			if(is_null($filler)) {

+				return NULL;

+			}

 

-            // inteleaved data and ecc codes

-            for($i=0; $i<$raw->dataLength + $raw->eccLength; $i++) {

-                $code = $raw->getCode();

-                $bit = 0x80;

-                for($j=0; $j<8; $j++) {

-                    $addr = $filler->next();

-                    $filler->setFrameAt($addr, 0x02 | (($bit & $code) != 0));

-                    $bit = $bit >> 1;

-                }

-            }

+			// inteleaved data and ecc codes

+			for($i=0; $i<$raw->dataLength + $raw->eccLength; $i++) {

+				$code = $raw->getCode();

+				$bit = 0x80;

+				for($j=0; $j<8; $j++) {

+					$addr = $filler->next();

+					$filler->setFrameAt($addr, 0x02 | (($bit & $code) != 0));

+					$bit = $bit >> 1;

+				}

+			}

             

-            QRtools::markTime('after_filler');

+			QRtools::markTime('after_filler');

             

-            unset($raw);

+			unset($raw);

             

-            // remainder bits

-            $j = QRspec::getRemainder($version);

-            for($i=0; $i<$j; $i++) {

-                $addr = $filler->next();

-                $filler->setFrameAt($addr, 0x02);

-            }

+			// remainder bits

+			$j = QRspec::getRemainder($version);

+			for($i=0; $i<$j; $i++) {

+				$addr = $filler->next();

+				$filler->setFrameAt($addr, 0x02);

+			}

             

-            $frame = $filler->frame;

-            unset($filler);

+			$frame = $filler->frame;

+			unset($filler);

             

             

-            // masking

-            $maskObj = new QRmask();

-            if($mask < 0) {

+			// masking

+			$maskObj = new QRmask();

+			if($mask < 0) {

             

-                if (QR_FIND_BEST_MASK) {

-                    $masked = $maskObj->mask($width, $frame, $input->getErrorCorrectionLevel());

-                } else {

-                    $masked = $maskObj->makeMask($width, $frame, (intval(QR_DEFAULT_MASK) % 8), $input->getErrorCorrectionLevel());

-                }

-            } else {

-                $masked = $maskObj->makeMask($width, $frame, $mask, $input->getErrorCorrectionLevel());

-            }

+				if (QR_FIND_BEST_MASK) {

+					$masked = $maskObj->mask($width, $frame, $input->getErrorCorrectionLevel());

+				} else {

+					$masked = $maskObj->makeMask($width, $frame, (intval(QR_DEFAULT_MASK) % 8), $input->getErrorCorrectionLevel());

+				}

+			} else {

+				$masked = $maskObj->makeMask($width, $frame, $mask, $input->getErrorCorrectionLevel());

+			}

             

-            if($masked == NULL) {

-                return NULL;

-            }

+			if($masked == NULL) {

+				return NULL;

+			}

             

-            QRtools::markTime('after_mask');

+			QRtools::markTime('after_mask');

             

-            $this->version = $version;

-            $this->width = $width;

-            $this->data = $masked;

+			$this->version = $version;

+			$this->width = $width;

+			$this->data = $masked;

             

-            return $this;

-        }

+			return $this;

+		}

     

-        //----------------------------------------------------------------------

-        public function encodeInput(QRinput $input)

-        {

-            return $this->encodeMask($input, -1);

-        }

+		//----------------------------------------------------------------------

+		public function encodeInput(QRinput $input)

+		{

+			return $this->encodeMask($input, -1);

+		}

         

-        //----------------------------------------------------------------------

-        public function encodeString8bit($string, $version, $level)

-        {

-            if(string == NULL) {

-                throw new Exception('empty string!');

-                return NULL;

-            }

+		//----------------------------------------------------------------------

+		public function encodeString8bit($string, $version, $level)

+		{

+			if(string == NULL) {

+				throw new Exception('empty string!');

+				return NULL;

+			}

 

-            $input = new QRinput($version, $level);

-            if($input == NULL) return NULL;

+			$input = new QRinput($version, $level);

+			if($input == NULL) return NULL;

 

-            $ret = $input->append($input, QR_MODE_8, strlen($string), str_split($string));

-            if($ret < 0) {

-                unset($input);

-                return NULL;

-            }

-            return $this->encodeInput($input);

-        }

+			$ret = $input->append($input, QR_MODE_8, strlen($string), str_split($string));

+			if($ret < 0) {

+				unset($input);

+				return NULL;

+			}

+			return $this->encodeInput($input);

+		}

 

-        //----------------------------------------------------------------------

-        public function encodeString($string, $version, $level, $hint, $casesensitive)

-        {

+		//----------------------------------------------------------------------

+		public function encodeString($string, $version, $level, $hint, $casesensitive)

+		{

 

-            if($hint != QR_MODE_8 && $hint != QR_MODE_KANJI) {

-                throw new Exception('bad hint');

-                return NULL;

-            }

+			if($hint != QR_MODE_8 && $hint != QR_MODE_KANJI) {

+				throw new Exception('bad hint');

+				return NULL;

+			}

 

-            $input = new QRinput($version, $level);

-            if($input == NULL) return NULL;

+			$input = new QRinput($version, $level);

+			if($input == NULL) return NULL;

 

-            $ret = QRsplit::splitStringToQRinput($string, $input, $hint, $casesensitive);

-            if($ret < 0) {

-                return NULL;

-            }

+			$ret = QRsplit::splitStringToQRinput($string, $input, $hint, $casesensitive);

+			if($ret < 0) {

+				return NULL;

+			}

 

-            return $this->encodeInput($input);

-        }

+			return $this->encodeInput($input);

+		}

         

-        //----------------------------------------------------------------------

-        public static function png($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4, $saveandprint=false) 

-        {

-            $enc = QRencode::factory($level, $size, $margin);

-            return $enc->encodePNG($text, $outfile, $saveandprint=false);

-        }

+		//----------------------------------------------------------------------

+		public static function png($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4, $saveandprint=false) 

+		{

+			$enc = QRencode::factory($level, $size, $margin);

+			return $enc->encodePNG($text, $outfile, $saveandprint=false);

+		}

 

-        //----------------------------------------------------------------------

-        public static function text($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4) 

-        {

-            $enc = QRencode::factory($level, $size, $margin);

-            return $enc->encode($text, $outfile);

-        }

+		//----------------------------------------------------------------------

+		public static function text($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4) 

+		{

+			$enc = QRencode::factory($level, $size, $margin);

+			return $enc->encode($text, $outfile);

+		}

 

-        //----------------------------------------------------------------------

-        public static function raw($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4) 

-        {

-            $enc = QRencode::factory($level, $size, $margin);

-            return $enc->encodeRAW($text, $outfile);

-        }

-    }

+		//----------------------------------------------------------------------

+		public static function raw($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4) 

+		{

+			$enc = QRencode::factory($level, $size, $margin);

+			return $enc->encodeRAW($text, $outfile);

+		}

+	}

     

-    //##########################################################################

+	//##########################################################################

     

-    class FrameFiller {

+	class FrameFiller {

     

-        public $width;

-        public $frame;

-        public $x;

-        public $y;

-        public $dir;

-        public $bit;

+		public $width;

+		public $frame;

+		public $x;

+		public $y;

+		public $dir;

+		public $bit;

         

-        //----------------------------------------------------------------------

-        public function __construct($width, &$frame)

-        {

-            $this->width = $width;

-            $this->frame = $frame;

-            $this->x = $width - 1;

-            $this->y = $width - 1;

-            $this->dir = -1;

-            $this->bit = -1;

-        }

+		//----------------------------------------------------------------------

+		public function __construct($width, &$frame)

+		{

+			$this->width = $width;

+			$this->frame = $frame;

+			$this->x = $width - 1;

+			$this->y = $width - 1;

+			$this->dir = -1;

+			$this->bit = -1;

+		}

         

-        //----------------------------------------------------------------------

-        public function setFrameAt($at, $val)

-        {

-            $this->frame[$at['y']][$at['x']] = chr($val);

-        }

+		//----------------------------------------------------------------------

+		public function setFrameAt($at, $val)

+		{

+			$this->frame[$at['y']][$at['x']] = chr($val);

+		}

         

-        //----------------------------------------------------------------------

-        public function getFrameAt($at)

-        {

-            return ord($this->frame[$at['y']][$at['x']]);

-        }

+		//----------------------------------------------------------------------

+		public function getFrameAt($at)

+		{

+			return ord($this->frame[$at['y']][$at['x']]);

+		}

         

-        //----------------------------------------------------------------------

-        public function next()

-        {

-            do {

+		//----------------------------------------------------------------------

+		public function next()

+		{

+			do {

             

-                if($this->bit == -1) {

-                    $this->bit = 0;

-                    return array('x'=>$this->x, 'y'=>$this->y);

-                }

+				if($this->bit == -1) {

+					$this->bit = 0;

+					return array('x'=>$this->x, 'y'=>$this->y);

+				}

 

-                $x = $this->x;

-                $y = $this->y;

-                $w = $this->width;

+				$x = $this->x;

+				$y = $this->y;

+				$w = $this->width;

 

-                if($this->bit == 0) {

-                    $x--;

-                    $this->bit++;

-                } else {

-                    $x++;

-                    $y += $this->dir;

-                    $this->bit--;

-                }

+				if($this->bit == 0) {

+					$x--;

+					$this->bit++;

+				} else {

+					$x++;

+					$y += $this->dir;

+					$this->bit--;

+				}

 

-                if($this->dir < 0) {

-                    if($y < 0) {

-                        $y = 0;

-                        $x -= 2;

-                        $this->dir = 1;

-                        if($x == 6) {

-                            $x--;

-                            $y = 9;

-                        }

-                    }

-                } else {

-                    if($y == $w) {

-                        $y = $w - 1;

-                        $x -= 2;

-                        $this->dir = -1;

-                        if($x == 6) {

-                            $x--;

-                            $y -= 8;

-                        }

-                    }

-                }

-                if($x < 0 || $y < 0) return null;

+				if($this->dir < 0) {

+					if($y < 0) {

+						$y = 0;

+						$x -= 2;

+						$this->dir = 1;

+						if($x == 6) {

+							$x--;

+							$y = 9;

+						}

+					}

+				} else {

+					if($y == $w) {

+						$y = $w - 1;

+						$x -= 2;

+						$this->dir = -1;

+						if($x == 6) {

+							$x--;

+							$y -= 8;

+						}

+					}

+				}

+				if($x < 0 || $y < 0) return null;

 

-                $this->x = $x;

-                $this->y = $y;

+				$this->x = $x;

+				$this->y = $y;

 

-            } while(ord($this->frame[$y][$x]) & 0x80);

+			} while(ord($this->frame[$y][$x]) & 0x80);

                         

-            return array('x'=>$x, 'y'=>$y);

-        }

+			return array('x'=>$x, 'y'=>$y);

+		}

         

-    } ;

+	} ;

     

-    //##########################################################################    

+	//##########################################################################    

     

-    class QRencode {

+	class QRencode {

     

-        public $casesensitive = true;

-        public $eightbit = false;

+		public $casesensitive = true;

+		public $eightbit = false;

         

-        public $version = 0;

-        public $size = 3;

-        public $margin = 4;

+		public $version = 0;

+		public $size = 3;

+		public $margin = 4;

         

-        public $structured = 0; // not supported yet

+		public $structured = 0; // not supported yet

         

-        public $level = QR_ECLEVEL_L;

-        public $hint = QR_MODE_8;

+		public $level = QR_ECLEVEL_L;

+		public $hint = QR_MODE_8;

         

-        //----------------------------------------------------------------------

-        public static function factory($level = QR_ECLEVEL_L, $size = 3, $margin = 4)

-        {

-            $enc = new QRencode();

-            $enc->size = $size;

-            $enc->margin = $margin;

+		//----------------------------------------------------------------------

+		public static function factory($level = QR_ECLEVEL_L, $size = 3, $margin = 4)

+		{

+			$enc = new QRencode();

+			$enc->size = $size;

+			$enc->margin = $margin;

             

-            switch ($level.'') {

-                case '0':

-                case '1':

-                case '2':

-                case '3':

-                        $enc->level = $level;

-                    break;

-                case 'l':

-                case 'L':

-                        $enc->level = QR_ECLEVEL_L;

-                    break;

-                case 'm':

-                case 'M':

-                        $enc->level = QR_ECLEVEL_M;

-                    break;

-                case 'q':

-                case 'Q':

-                        $enc->level = QR_ECLEVEL_Q;

-                    break;

-                case 'h':

-                case 'H':

-                        $enc->level = QR_ECLEVEL_H;

-                    break;

-            }

+			switch ($level.'') {

+				case '0':

+				case '1':

+				case '2':

+				case '3':

+						$enc->level = $level;

+					break;

+				case 'l':

+				case 'L':

+						$enc->level = QR_ECLEVEL_L;

+					break;

+				case 'm':

+				case 'M':

+						$enc->level = QR_ECLEVEL_M;

+					break;

+				case 'q':

+				case 'Q':

+						$enc->level = QR_ECLEVEL_Q;

+					break;

+				case 'h':

+				case 'H':

+						$enc->level = QR_ECLEVEL_H;

+					break;

+			}

             

-            return $enc;

-        }

+			return $enc;

+		}

         

-        //----------------------------------------------------------------------

-        public function encodeRAW($intext, $outfile = false) 

-        {

-            $code = new QRcode();

+		//----------------------------------------------------------------------

+		public function encodeRAW($intext, $outfile = false) 

+		{

+			$code = new QRcode();

 

-            if($this->eightbit) {

-                $code->encodeString8bit($intext, $this->version, $this->level);

-            } else {

-                $code->encodeString($intext, $this->version, $this->level, $this->hint, $this->casesensitive);

-            }

+			if($this->eightbit) {

+				$code->encodeString8bit($intext, $this->version, $this->level);

+			} else {

+				$code->encodeString($intext, $this->version, $this->level, $this->hint, $this->casesensitive);

+			}

             

-            return $code->data;

-        }

+			return $code->data;

+		}

 

-        //----------------------------------------------------------------------

-        public function encode($intext, $outfile = false) 

-        {

-            $code = new QRcode();

+		//----------------------------------------------------------------------

+		public function encode($intext, $outfile = false) 

+		{

+			$code = new QRcode();

 

-            if($this->eightbit) {

-                $code->encodeString8bit($intext, $this->version, $this->level);

-            } else {

-                $code->encodeString($intext, $this->version, $this->level, $this->hint, $this->casesensitive);

-            }

+			if($this->eightbit) {

+				$code->encodeString8bit($intext, $this->version, $this->level);

+			} else {

+				$code->encodeString($intext, $this->version, $this->level, $this->hint, $this->casesensitive);

+			}

             

-            QRtools::markTime('after_encode');

+			QRtools::markTime('after_encode');

             

-            if ($outfile!== false) {

-                file_put_contents($outfile, join("\n", QRtools::binarize($code->data)));

-            } else {

-                return QRtools::binarize($code->data);

-            }

-        }

+			if ($outfile!== false) {

+				file_put_contents($outfile, join("\n", QRtools::binarize($code->data)));

+			} else {

+				return QRtools::binarize($code->data);

+			}

+		}

         

-        //----------------------------------------------------------------------

-        public function encodePNG($intext, $outfile = false,$saveandprint=false) 

-        {

-            try {

+		//----------------------------------------------------------------------

+		public function encodePNG($intext, $outfile = false,$saveandprint=false) 

+		{

+			try {

             

-                ob_start();

-                $tab = $this->encode($intext);

-                $err = ob_get_contents();

-                ob_end_clean();

+				ob_start();

+				$tab = $this->encode($intext);

+				$err = ob_get_contents();

+				ob_end_clean();

                 

-                if ($err != '')

-                    QRtools::log($outfile, $err);

+				if ($err != '')

+					QRtools::log($outfile, $err);

                 

-                $maxSize = (int)(QR_PNG_MAXIMUM_SIZE / (count($tab)+2*$this->margin));

+				$maxSize = (int)(QR_PNG_MAXIMUM_SIZE / (count($tab)+2*$this->margin));

                 

-                QRimage::png($tab, $outfile, min(max(1, $this->size), $maxSize), $this->margin,$saveandprint);

+				QRimage::png($tab, $outfile, min(max(1, $this->size), $maxSize), $this->margin,$saveandprint);

             

-            } catch (Exception $e) {

+			} catch (Exception $e) {

             

-                QRtools::log($outfile, $e->getMessage());

+				QRtools::log($outfile, $e->getMessage());

             

-            }

-        }

-    }

+			}

+		}

+	}