codysnider / tt-rss

install/index.php

Spacing +8 added lines, -8 removed lines

@@ -11,7 +11,7 @@ 
 		$query = "";
 
 		if (!(strpos($filename, "?") === FALSE)) {
-			$query = substr($filename, strpos($filename, "?")+1);
+			$query = substr($filename, strpos($filename, "?") + 1);
 			$filename = substr($filename, 0, strpos($filename, "?"));
 		}
 
@@ -85,7 +85,7 @@ 
 		$errors = array();
 
 		if (version_compare(PHP_VERSION, '5.6.0', '<')) {
-			array_push($errors, "PHP version 5.6.0 or newer required. You're using " . PHP_VERSION . ".");
+			array_push($errors, "PHP version 5.6.0 or newer required. You're using ".PHP_VERSION.".");
 		}
 
 		if (!function_exists("curl_init") && !ini_get("allow_url_fopen")) {
@@ -133,17 +133,17 @@ 
 
 	function pdo_connect($host, $user, $pass, $db, $type, $port = false) {
 
-		$db_port = $port ? ';port=' . $port : '';
-		$db_host = $host ? ';host=' . $host : '';
+		$db_port = $port ? ';port='.$port : '';
+		$db_host = $host ? ';host='.$host : '';
 
 		try {
-			$pdo = new PDO($type . ':dbname=' . $db . $db_host . $db_port,
+			$pdo = new PDO($type.':dbname='.$db.$db_host.$db_port,
 				$user,
 				$pass);
 
 			return $pdo;
 		} catch (Exception $e) {
-		    print "<div class='alert alert-danger'>" . $e->getMessage() . "</div>";
+		    print "<div class='alert alert-danger'>".$e->getMessage()."</div>";
 		    return null;
         }
 	}
@@ -189,7 +189,7 @@ 
 	}
 
 	function make_self_url_path() {
-		$url_path = (is_server_https() ? 'https://' :  'http://') . $_SERVER["HTTP_HOST"] . parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH);
+		$url_path = (is_server_https() ? 'https://' : 'http://').$_SERVER["HTTP_HOST"].parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH);
 
 		return $url_path;
 	}
@@ -437,7 +437,7 @@ 
 
 						if (!$res) {
 							print_notice("Query: $line");
-							print_error("Error: " . implode(", ", $pdo->errorInfo()));
+							print_error("Error: ".implode(", ", $pdo->errorInfo()));
                         }
 					}
 				}

opml.php

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+	set_include_path(dirname(__FILE__)."/include".PATH_SEPARATOR.
 		get_include_path());
 
 	require_once "autoload.php";
@@ -14,11 +14,11 @@ 
 
 	$op = $_REQUEST['op'];
 
-	if ($op == "publish"){
+	if ($op == "publish") {
 		$key = $_REQUEST["key"];
 		$pdo = Db::pdo();
 
-		$sth = $pdo->prepare( "SELECT owner_uid
+		$sth = $pdo->prepare("SELECT owner_uid
 				FROM ttrss_access_keys WHERE
 				access_key = ? AND feed_id = 'OPML:Publish'");
 		$sth->execute([$key]);

lib/MiniTemplator.class.php

Spacing +165 added lines, -165 removed lines

@@ -89,16 +89,16 @@ 
 * @access private

 */

 

-var $maxNestingLevel = 50;            // maximum number of block nestings

-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

+var $maxNestingLevel = 50; // maximum number of block nestings

+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

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

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

-var $varRefTab;                       // variable references table

+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

@@ -106,8 +106,8 @@ 
     //  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

+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

@@ -126,12 +126,12 @@ 
     //  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 $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.

-var $blockInstTab;                    // block instances table

+var $blockInstTab; // block instances table

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

     // Indexed by BlockInstNo.

     // Fields:

@@ -143,14 +143,14 @@ 
     //  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 $blockInstTabCnt; // no of entries used in BlockInstTab

 

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

-var $templateValid;                   // true if a valid template is prepared

-var $outputMode;                      // 0 = to PHP output stream, 1 = to file, 2 = to string

-var $outputFileHandle;                // file handle during writing of output file

-var $outputError;                     // true when an output error occurred

-var $outputString;                    // string buffer for the generated HTML page

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

+var $templateValid; // true if a valid template is prepared

+var $outputMode; // 0 = to PHP output stream, 1 = to file, 2 = to string

+var $outputFileHandle; // file handle during writing of output file

+var $outputError; // true when an output error occurred

+var $outputString; // string buffer for the generated HTML page

 

 /**#@-*/

 

@@ -171,9 +171,9 @@ 
 * @return boolean  true on success, false on error.

 * @access public

 */

-function readTemplateFromFile ($fileName) {

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

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

+function readTemplateFromFile($fileName) {

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

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

       return false; }

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

    return true; }

@@ -184,7 +184,7 @@ 
 * @return boolean  true on success, false on error.

 * @access public

 */

-function setTemplateString ($templateString) {

+function setTemplateString($templateString) {

    $this->templateValid = false;

    $this->template = $templateString;

    if (!$this->parseTemplate()) return false;

@@ -197,10 +197,10 @@ 
 * @return boolean  true on success, false on error.

 * @access private

 */

-function loadSubtemplate ($subtemplateName, &$s) {

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

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

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

+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; }

    return true; }

 

@@ -243,7 +243,7 @@ 
 function beginMainBlock() {

    $blockNo = 0;

    $this->registerBlock('@@InternalMainBlock@@', $blockNo);

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

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

    $bte['tPosBegin'] = 0;

    $bte['tPosContentsBegin'] = 0;

    $bte['nestingLevel'] = 0;

@@ -257,7 +257,7 @@ 
 * @access private

 */

 function endMainBlock() {

-   $bte =& $this->blockTab[0];

+   $bte = & $this->blockTab[0];

    $bte['tPosContentsEnd'] = strlen($this->template);

    $bte['tPosEnd'] = strlen($this->template);

    $bte['definitionIsOpen'] = false;

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

    $p = 0;

    while (true) {

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

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

       if ($p0 === false) break;

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

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

       if ($p === false) {

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

+         $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))

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

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

          return false;

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

    return true; }

@@ -288,29 +288,29 @@ 
 * @return boolean  true on success, false on error.

 * @access private

 */

-function processTemplateCommand ($cmdL, $cmdTPosBegin, $cmdTPosEnd, &$resumeFromStart) {

+function processTemplateCommand($cmdL, $cmdTPosBegin, $cmdTPosEnd, &$resumeFromStart) {

    $resumeFromStart = false;

    $p = 0;

    $cmd = '';

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

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

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

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

    switch (strtoupper($cmd)) {

       case '$BEGINBLOCK':

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

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

             return false;

          break;

       case '$ENDBLOCK':

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

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

             return false;

          break;

       case '$INCLUDE':

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

+         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.");

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

             return false; }}

     return true; }

 

@@ -319,24 +319,24 @@ 
 * @return boolean  true on success, false on error.

 * @access private

 */

-function processBeginBlockCmd ($parms, $cmdTPosBegin, $cmdTPosEnd) {

+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.");

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

+      $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.");

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

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

       return false; }

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

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

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

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

    $btr['tPosBegin'] = $cmdTPosBegin;

    $btr['tPosContentsBegin'] = $cmdTPosEnd;

    $btr['nestingLevel'] = $this->currentNestingLevel;

-   $btr['parentBlockNo'] = $this->openBlocksTab[$this->currentNestingLevel-1];

+   $btr['parentBlockNo'] = $this->openBlocksTab[$this->currentNestingLevel - 1];

    $this->openBlocksTab[$this->currentNestingLevel] = $blockNo;

    $this->currentNestingLevel += 1;

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

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

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

       return false; }

    return true; }

 

@@ -345,24 +345,24 @@ 
 * @return boolean  true on success, false on error.

 * @access private

 */

-function processEndBlockCmd ($parms, $cmdTPosBegin, $cmdTPosEnd) {

+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.");

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

+      $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.");

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

+      $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.");

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

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

       return false; }

    $this->currentNestingLevel -= 1;

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

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

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

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

+      $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.");

+      $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;

@@ -374,10 +374,10 @@ 
 */

 function registerBlock($blockName, &$blockNo) {

    $blockNo = $this->blockTabCnt++;

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

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

    $btr = array();

    $btr['blockName'] = $blockName;

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

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

       $btr['nextWithSameName'] = -1;

    $btr['definitionIsOpen'] = true;

    $btr['instances'] = 0;

@@ -394,13 +394,13 @@ 
 * @access private

 */

 function checkBlockDefinitionsComplete() {

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

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

+   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'] . ".");

+         $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.");

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

       return false; }

    return true; }

 

@@ -409,29 +409,29 @@ 
 * @return boolean  true on success, false on error.

 * @access private

 */

-function processIncludeCmd ($parms, $cmdTPosBegin, $cmdTPosEnd) {

+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.");

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

+      $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.");

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

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

       return false; }

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

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

 

 /**

 * Processes the $Include command.

 * @return boolean  true on success, false on error.

 * @access private

 */

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

+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.");

+      $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;

+   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.)

-   $this->template = substr($this->template,0,$tPos1) . $subtemplate . substr($this->template,$tPos2);

+   $this->template = substr($this->template, 0, $tPos1).$subtemplate.substr($this->template, $tPos2);

    return true; }

 

 /**

@@ -447,24 +447,24 @@ 
       $p0 = $p;

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

       if ($p === false) {

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

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

          return false; }

       $p += 1;

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

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

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

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

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

          return false; }

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

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

    return true; }

 

 /**

 * @access private

 */

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

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

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

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

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

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

    $varRefNo = $this->varRefTabCnt++;

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

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

    $vrtr = array();

    $vrtr['tPosBegin'] = $tPosBegin;

    $vrtr['tPosEnd'] = $tPosEnd;

@@ -473,9 +473,9 @@ 
 /**

 * @access private

 */

-function registerVariable ($varName, &$varNo) {

+function registerVariable($varName, &$varNo) {

    $varNo = $this->varTabCnt++;

-   $vtr =& $this->varTab[$varNo];

+   $vtr = & $this->varTab[$varNo];

    $vtr = array();

    $vtr['varName'] = $varName;

    $vtr['varValue'] = '';

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

    $nextBlockNo = 1;

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

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

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

       $varRefTPos = $vrtr['tPosBegin'];

       $varNo = $vrtr['varNo'];

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

@@ -501,7 +501,7 @@ 
             $activeBlockNo = $nextBlockNo;

             $nextBlockNo += 1;

             continue; }}

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

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

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

          $this->programLogicError(1);

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

@@ -523,10 +523,10 @@ 
 * @access public

 */

 function reset() {

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

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

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

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

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

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

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

       $btr['instances'] = 0;

       $btr['firstBlockInstNo'] = -1;

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

@@ -548,11 +548,11 @@ 
 *    $isOptional is false).

 * @access public

 */

-function setVariable ($variableName, $variableValue, $isOptional=false) {

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

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

+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.");

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

       return false; }

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

    return true; }

@@ -575,8 +575,8 @@ 
 *    $isOptional is false).

 * @access public

 */

-function setVariableEsc ($variableName, $variableValue, $isOptional=false) {

-   return $this->setVariable($variableName,htmlspecialchars($variableValue,ENT_QUOTES),$isOptional); }

+function setVariableEsc($variableName, $variableValue, $isOptional = false) {

+   return $this->setVariable($variableName, htmlspecialchars($variableValue, ENT_QUOTES), $isOptional); }

 

 /**

 * Checks whether a variable with the specified name exists within the template.

@@ -585,9 +585,9 @@ 
 *    variable with the specified name exists in the template.

 * @access public

 */

-function variableExists ($variableName) {

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

-   return $this->lookupVariableName($variableName,$varNo); }

+function variableExists($variableName) {

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

+   return $this->lookupVariableName($variableName, $varNo); }

 

 /**

 * Adds an instance of a template block.

@@ -603,9 +603,9 @@ 
 * @access public

 */

 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.");

+   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; }

    while ($blockNo != -1) {

       $this->addBlockByNo($blockNo);

@@ -615,10 +615,10 @@ 
 /**

 * @access private

 */

-function addBlockByNo ($blockNo) {

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

-   $this->registerBlockInstance ($blockInstNo);

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

+function addBlockByNo($blockNo) {

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

+   $this->registerBlockInstance($blockInstNo);

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

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

       $btr['firstBlockInstNo'] = $blockInstNo;

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

@@ -636,14 +636,14 @@ 
    $bitr['nextBlockInstNo'] = -1;

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

    // copy instance variables for this block

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

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

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

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

 

 /**

 * @access private

 */

-function registerBlockInstance (&$blockInstNo) {

+function registerBlockInstance(&$blockInstNo) {

    $blockInstNo = $this->blockInstTabCnt++; }

 

 /**

@@ -653,9 +653,9 @@ 
 *    block with the specified name exists in the template.

 * @access public

 */

-function blockExists ($blockName) {

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

-   return $this->lookupBlockName($blockName,$blockNo); }

+function blockExists($blockName) {

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

+   return $this->lookupBlockName($blockName, $blockNo); }

 

 //--- output generation ---------------------------------------------------------------------------------------------

 

@@ -664,7 +664,7 @@ 
 * @return boolean  true on success, false on error.

 * @access public

 */

-function generateOutput () {

+function generateOutput() {

    $this->outputMode = 0;

    if (!$this->generateOutputPage()) return false;

    return true; }

@@ -675,13 +675,13 @@ 
 * @return boolean  true on success, false on error.

 * @access public

 */

-function generateOutputToFile ($fileName) {

-   $fh = fopen($fileName,"wb");

+function generateOutputToFile($fileName) {

+   $fh = fopen($fileName, "wb");

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

    $this->outputMode = 1;

    $this->outputFileHandle = $fh;

    $ok = $this->generateOutputPage();

-   fclose ($fh);

+   fclose($fh);

    return $ok; }

 

 /**

@@ -691,7 +691,7 @@ 
 * @return boolean  true on success, false on error.

 * @access public

 */

-function generateOutputToString (&$outputString) {

+function generateOutputToString(&$outputString) {

    $outputString = "Error";

    $this->outputMode = 2;

    $this->outputString = "";

@@ -704,14 +704,14 @@ 
 * @return boolean  true on success, false on error.

 */

 function generateOutputPage() {

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

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

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

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

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

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

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

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

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

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

    $this->outputError = false;

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

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

    if ($this->outputError) return false;

    return true; }

 

@@ -721,33 +721,33 @@ 
 * Called recursively.

 * @access private

 */

-function writeBlockInstances ($blockNo, $parentInstLevel) {

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

+function writeBlockInstances($blockNo, $parentInstLevel) {

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

    while (!$this->outputError) {

       $blockInstNo = $btr['currBlockInstNo'];

       if ($blockInstNo == -1) break;

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

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

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

-         $this->programLogicError (2);

+         $this->programLogicError(2);

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

-      $this->writeBlockInstance ($blockInstNo);

+      $this->writeBlockInstance($blockInstNo);

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

 

 /**

 * @access private

 */

 function writeBlockInstance($blockInstNo) {

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

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

    $blockNo = $bitr['blockNo'];

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

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

    $tPos = $btr['tPosContentsBegin'];

    $subBlockNo = $blockNo + 1;

    $varRefNo = $btr['firstVarRefNo'];

    while (!$this->outputError) {

       $tPos2 = $btr['tPosContentsEnd'];

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

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

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

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

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

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

             $varRefNo += 1;

             continue; }

@@ -755,7 +755,7 @@ 
             $tPos2 = $vrtr['tPosBegin'];

             $kind = 1; }}

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

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

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

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

             $subBlockNo += 1;

             continue; }

@@ -763,24 +763,24 @@ 
             $tPos2 = $subBtr['tPosBegin'];

             $kind = 2; }}

       if ($tPos2 > $tPos)

-         $this->writeString (substr($this->template,$tPos,$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];

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

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

-               $this->programLogicError (4);

+               $this->programLogicError(4);

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

-            $this->writeString ($variableValue);

+            $this->writeString($variableValue);

             $tPos = $vrtr['tPosEnd'];

             $varRefNo += 1;

             break;

          case 2:         // sub block

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

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

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

-               $this->programLogicError (3);

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

+               $this->programLogicError(3);

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

             $tPos = $subBtr['tPosEnd'];

             $subBlockNo += 1;

             break; }}}

@@ -788,7 +788,7 @@ 
 /**

 * @access private

 */

-function writeString ($s) {

+function writeString($s) {

    if ($this->outputError) return;

    switch ($this->outputMode) {

       case 0:            // output to PHP output stream

@@ -810,8 +810,8 @@ 
 * @return boolean  true on success, false if the variable is not found.

 * @access private

 */

-function lookupVariableName ($varName, &$varNo) {

-   $x =& $this->varNameToNoMap[strtoupper($varName)];

+function lookupVariableName($varName, &$varNo) {

+   $x = & $this->varNameToNoMap[strtoupper($varName)];

    if (!isset($x)) return false;

    $varNo = $x;

    return true; }

@@ -823,8 +823,8 @@ 
 * @return boolean  true on success, false when the block is not found.

 * @access private

 */

-function lookupBlockName ($blockName, &$blockNo) {

-   $x =& $this->blockNameToNoMap[strtoupper($blockName)];

+function lookupBlockName($blockName, &$blockNo) {

+   $x = & $this->blockNameToNoMap[strtoupper($blockName)];

    if (!isset($x)) return false;

    $blockNo = $x;

    return true; }

@@ -836,17 +836,17 @@ 
 * @return boolean  true on success, false on error.

 * @access private

 */

-function readFileIntoString ($fileName, &$s) {

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

+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; }

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

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

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

    $fileSize = filesize($fileName);

-   if ($fileSize === false) {fclose ($fh); return false; }

-   $s = fread($fh,$fileSize);

-   fclose ($fh);

+   if ($fileSize === false) {fclose($fh); return false; }

+   $s = fread($fh, $fileSize);

+   fclose($fh);

    if (strlen($s) != $fileSize) return false;

    return true; }

 

@@ -854,7 +854,7 @@ 
 * @access private

 * @return boolean  true on success, false when the end of the string is reached.

 */

-function parseWord ($s, &$p, &$w) {

+function parseWord($s, &$p, &$w) {

    $sLen = strlen($s);

    while ($p < $sLen && ord($s{$p}) <= 32) $p++;

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

@@ -867,11 +867,11 @@ 
 * @access private

 * @return boolean  true on success, false on error.

 */

-function parseQuotedString ($s, &$p, &$w) {

+function parseQuotedString($s, &$p, &$w) {

    $sLen = strlen($s);

    while ($p < $sLen && ord($s{$p}) <= 32) $p++;

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

-   if (substr($s,$p,1) != '"') return false;

+   if (substr($s, $p, 1) != '"') return false;

    $p++; $p0 = $p;

    while ($p < $sLen && $s{$p} != '"') $p++;

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

@@ -883,39 +883,39 @@ 
 * @access private

 * @return boolean  true on success, false on error.

 */

-function parseWordOrQuotedString ($s, &$p, &$w) {

+function parseWordOrQuotedString($s, &$p, &$w) {

    $sLen = strlen($s);

    while ($p < $sLen && ord($s{$p}) <= 32) $p++;

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

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

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

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

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

     else

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

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

 

 /**

 * Combine two file system paths.

 * @access private

 */

-function combineFileSystemPath ($path1, $path2) {

+function combineFileSystemPath($path1, $path2) {

    if ($path1 == '' || $path2 == '') return $path2;

    $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);

+   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.$path2;

    return $s; }

 

 /**

 * @access private

 */

-function triggerError ($msg) {

-   trigger_error ("MiniTemplator error: $msg", E_USER_ERROR); }

+function triggerError($msg) {

+   trigger_error("MiniTemplator error: $msg", E_USER_ERROR); }

 

 /**

 * @access private

 */

-function programLogicError ($errorId) {

+function programLogicError($errorId) {

    die ("MiniTemplator: Program logic error $errorId.\n"); }

 

 }

lib/jimIcon.php

Spacing +18 added lines, -18 removed lines

@@ -67,13 +67,13 @@ 
                         $entry = substr($ico, 6 + 16 * $i, 16);
                         if (!$entry || strlen($entry) < 16)
                                 continue;
-                        $e = unpack("Cwidth/" .
-                                    "Cheight/" .
-                                    "Ccolors/" .
-                                    "Czero/" .
-                                    "vplanes/" .
-                                    "vbpp/" .
-                                    "Vsize/" .
+                        $e = unpack("Cwidth/".
+                                    "Cheight/".
+                                    "Ccolors/".
+                                    "Czero/".
+                                    "vplanes/".
+                                    "vbpp/".
+                                    "Vsize/".
                                     "Voffset/",
                                     $entry);
                         if ($e["width"] == 0)
@@ -122,16 +122,16 @@ 
                 // directory entry.
                 $bitmapinfo = unpack("Vsize", $data);
                 if ($bitmapinfo["size"] == 40) {
-                        $info = unpack("Vsize/" .
-                                       "Vwidth/" .
-                                       "Vheight/" .
-                                       "vplanes/" .
-                                       "vbpp/" .
-                                       "Vcompress/" .
-                                       "Vsize/" .
-                                       "Vxres/" .
-                                       "Vyres/" .
-                                       "Vpalcolors/" .
+                        $info = unpack("Vsize/".
+                                       "Vwidth/".
+                                       "Vheight/".
+                                       "vplanes/".
+                                       "vbpp/".
+                                       "Vcompress/".
+                                       "Vsize/".
+                                       "Vxres/".
+                                       "Vyres/".
+                                       "Vpalcolors/".
                                        "Vimpcolors/", $data);
                         if ($e["bpp"] == 0) {
                                 $e["bpp"] = $info["bpp"];
@@ -212,7 +212,7 @@ 
                                         $pixel1 = $palette[$p >> 4];
                                         $pixel2 = $palette[$p & 0x0f];
                                         $XOR[$y][$x] = $pixel1;
-                                        $XOR[$y][$x+1] = $pixel2;
+                                        $XOR[$y][$x + 1] = $pixel2;
                                         $x += 2;
                                         $offset++;
                                 } elseif ($bpp == 8) {

lib/phpqrcode/qrconst.php

Spacing +2 added lines, -2 removed lines

@@ -45,10 +45,10 @@
 	// Supported output formats

 	

 	define('QR_FORMAT_TEXT', 0);

-	define('QR_FORMAT_PNG',  1);

+	define('QR_FORMAT_PNG', 1);

 	

 	class qrstr {

 		public static function set(&$srctab, $x, $y, $repl, $replLen = false) {

-			$srctab[$y] = substr_replace($srctab[$y], ($replLen !== false)?substr($repl,0,$replLen):$repl, $x, ($replLen !== false)?$replLen:strlen($repl));

+			$srctab[$y] = substr_replace($srctab[$y], ($replLen !== false) ?substr($repl, 0, $replLen) : $repl, $x, ($replLen !== false) ? $replLen : strlen($repl));

 		}

 	}	
\ No newline at end of file

lib/phpqrcode/tools/merge.php

Spacing +3 added lines, -3 removed lines

@@ -51,11 +51,11 @@
     

     $outputCode = '';

     

-    foreach($fileList as $fileName) {

+    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);

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

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

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

     }

     

lib/phpqrcode/tools/merged_config.php

Spacing +7 added lines, -7 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

+    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

Spacing +17 added lines, -17 removed lines

@@ -49,8 +49,8 @@ 
             $bstream->allocate($bits);

             

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

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

-                if($num & $mask) {

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

+                if ($num & $mask) {

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

                 } else {

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

@@ -66,12 +66,12 @@ 
         {

             $bstream = new QRbitstream();

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

-            $p=0;

+            $p = 0;

 

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

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

                 $mask = 0x80;

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

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

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

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

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

                     } else {

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

@@ -91,11 +91,11 @@ 
                 return -1;

             }

             

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

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

                 return 0;

             }

             

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

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

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

                 return 0;

             }

@@ -113,7 +113,7 @@ 
 

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

             

-            if(is_null($b))

+            if (is_null($b))

                 return -1;

 

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

@@ -130,7 +130,7 @@ 
 

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

             

-            if(is_null($b))

+            if (is_null($b))

                 return -1;

 

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

@@ -145,18 +145,18 @@ 
         

             $size = $this->size();

 

-            if($size == 0) {

+            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;

             

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

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

                 $v = 0;

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

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

                     $v = $v << 1;

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

                     $p++;

@@ -164,9 +164,9 @@ 
                 $data[$i] = $v;

             }

             

-            if($size & 7) {

+            if ($size & 7) {

                 $v = 0;

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

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

                     $v = $v << 1;

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

                     $p++;

lib/phpqrcode/qrsplit.php

Spacing +40 added lines, -40 removed lines

@@ -50,7 +50,7 @@ 
             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')));

         }

         

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

@@ -70,17 +70,17 @@ 
                 

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

             

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

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

                 return QR_MODE_NUM;

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

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

                 return QR_MODE_AN;

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

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

             

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

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

                 {

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

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

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

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

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

                         return QR_MODE_KANJI;

                     }

                 }

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

 

             $p = 0;

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

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

                 $p++;

             }

             

             $run = $p;

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

             

-            if($mode == QR_MODE_8) {

+            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) {

+                if ($dif > 0) {

                     return $this->eat8();

                 }

             }

-            if($mode == QR_MODE_AN) {

+            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) {

+                     - 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)

+            if ($ret < 0)

                 return -1;

 

             return $run;

@@ -129,15 +129,15 @@ 
         //----------------------------------------------------------------------

         public function eatAn()

         {

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

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

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

 

             $p = 0;

             

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

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

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

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

                     $q = $p;

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

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

                         $q++;

                     }

                     

@@ -145,7 +145,7 @@ 
                          + QRinput::estimateBitsModeNum($q - $p) + 4 + $ln

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

                          

-                    if($dif < 0) {

+                    if ($dif < 0) {

                         break;

                     } else {

                         $p = $q;

@@ -157,17 +157,17 @@ 
 

             $run = $p;

 

-            if(!self::isalnumat($this->dataStr, $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) {

+                if ($dif > 0) {

                     return $this->eat8();

                 }

             }

 

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

-            if($ret < 0)

+            if ($ret < 0)

                 return -1;

 

             return $run;

@@ -178,12 +178,12 @@ 
         {

             $p = 0;

             

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

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

                 $p += 2;

             }

             

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

-            if($ret < 0)

+            if ($ret < 0)

                 return -1;

 

             return $ret;

@@ -198,34 +198,34 @@ 
             $p = 1;

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

             

-            while($p < $dataStrLen) {

+            while ($p < $dataStrLen) {

                 

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

-                if($mode == QR_MODE_KANJI) {

+                if ($mode == QR_MODE_KANJI) {

                     break;

                 }

-                if($mode == QR_MODE_NUM) {

+                if ($mode == QR_MODE_NUM) {

                     $q = $p;

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

+                    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) {

+                    if ($dif < 0) {

                         break;

                     } else {

                         $p = $q;

                     }

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

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

                     $q = $p;

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

+                    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) {

+                    if ($dif < 0) {

                         break;

                     } else {

                         $p = $q;

@@ -238,7 +238,7 @@ 
             $run = $p;

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

             

-            if($ret < 0)

+            if ($ret < 0)

                 return -1;

 

             return $run;

@@ -249,7 +249,7 @@ 
         {

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

             {

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

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

                     return 0;

 

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

@@ -266,8 +266,8 @@ 
                 

                 }

 

-                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);

             }

@@ -279,9 +279,9 @@ 
             $stringLen = strlen($this->dataStr);

             $p = 0;

             

-            while ($p<$stringLen) {

+            while ($p < $stringLen) {

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

-                if($mode == QR_MODE_KANJI) {

+                if ($mode == QR_MODE_KANJI) {

                     $p += 2;

                 } else {

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

@@ -297,13 +297,13 @@ 
         //----------------------------------------------------------------------

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

         {

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

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

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

             }

 

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

             

-            if(!$casesensitive)

+            if (!$casesensitive)

                 $split->toUpper();

                 

             return $split->splitString();