codysnider / tt-rss

lib/MiniTemplator.class.php

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

@@ -199,10 +199,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; }

 

@@ -279,15 +279,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; }

@@ -296,29 +296,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; }

 

@@ -327,24 +327,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; }

 

@@ -353,24 +353,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;

@@ -382,10 +382,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;

@@ -402,13 +402,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; }

 

@@ -417,29 +417,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; }

 

 /**

@@ -455,24 +455,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;

@@ -498,7 +498,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']) {

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

 			$nextBlockNo += 1;

 			continue; }}

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

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

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

 		 $this->programLogicError(1);

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

@@ -531,10 +531,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; }

@@ -556,11 +556,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; }

@@ -611,9 +611,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);

@@ -644,14 +644,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++; }

 

 /**

@@ -716,14 +716,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; }

 

@@ -733,33 +733,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; }

@@ -767,7 +767,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; }

@@ -775,24 +775,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; }}}

@@ -848,17 +848,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; }

 

@@ -901,39 +901,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"); }

 

 }

Braces +150 added lines, -73 removed lines

@@ -175,7 +175,9 @@ 
    if (!$this->readFileIntoString($fileName,$s)) {

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

 	  return false; }

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

+   if (!$this->setTemplateString($s)) {
+   	return false;
+   }
    return true; }

 

 /**

@@ -280,16 +282,22 @@ 
    $p = 0;

    while (true) {

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

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

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

+	  if (!$this->processTemplateCommand($cmdL,$p0,$p,$resumeFromStart)) {
+	  		 return false;
+	  }
+	  if ($resumeFromStart) {
+	  	$p = $p0;
+	  }
+	  }

    return true; }

 

 /**

@@ -300,20 +308,25 @@ 
    $resumeFromStart = false;

    $p = 0;

    $cmd = '';

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

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

+		 if (!$this->processBeginBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd)) {
+		 			return false;
+		 }
 		 break;

 	  case '$ENDBLOCK':

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

-			return false;

+		 if (!$this->processEndBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd)) {
+		 			return false;
+		 }
 		 break;

 	  case '$INCLUDE':

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

-			return false;

+		 if (!$this->processincludeCmd($parms,$cmdTPosBegin,$cmdTPosEnd)) {
+		 			return false;
+		 }
 		 $resumeFromStart = true;

 		 break;

 	  default:

@@ -385,8 +398,9 @@ 
    $btr =& $this->blockTab[$blockNo];

    $btr = array();

    $btr['blockName'] = $blockName;

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

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

+   if (!$this->lookupBlockName($blockName,$btr['nextWithSameName'])) {
+   	  $btr['nextWithSameName'] = -1;
+   }
    $btr['definitionIsOpen'] = true;

    $btr['instances'] = 0;

    $btr['firstBlockInstNo'] = -1;

@@ -436,7 +450,9 @@ 
    if (strlen($this->template) > $this->maxInclTemplateSize) {

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

@@ -451,7 +467,9 @@ 
    $p = 0;

    while (true) {

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

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

+	  if ($p === false) {
+	  	break;
+	  }
 	  $p0 = $p;

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

 	  if ($p === false) {

@@ -469,8 +487,9 @@ 
 * @access private

 */

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

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

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

+   if (!$this->lookupVariableName($varName,$varNo)) {
+   	  $this->registerVariable($varName,$varNo);
+   }
    $varRefNo = $this->varRefTabCnt++;

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

    $vrtr = array();

@@ -510,12 +529,14 @@ 
 			$nextBlockNo += 1;

 			continue; }}

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

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

-		 $this->programLogicError(1);

+	  if ($varRefTPos < $btr['tPosBegin']) {
+	  		 $this->programLogicError(1);
+	  }
 	  $blockVarNo = $btr['blockVarCnt']++;

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

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

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

+	  if ($btr['firstVarRefNo'] == -1) {
+	  		 $btr['firstVarRefNo'] = $varRefNo;
+	  }
 	  $vrtr['blockNo'] = $activeBlockNo;

 	  $vrtr['blockVarNo'] = $blockVarNo;

 	  $varRefNo += 1; }}

@@ -531,8 +552,9 @@ 
 * @access public

 */

 function reset() {

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

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

+   for ($varNo=0; $varNo<$this->varTabCnt; $varNo++) {
+   	  $this->varTab[$varNo]['varValue'] = '';
+   }
    for ($blockNo=0; $blockNo<$this->blockTabCnt; $blockNo++) {

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

 	  $btr['instances'] = 0;

@@ -559,7 +581,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;

+	  if ($isOptional) {
+	  	return true;
+	  }
 	  $this->triggerError ("Variable \"$variableName\" not defined in template.");

 	  return false; }

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

@@ -627,20 +651,23 @@ 
    $btr = & $this->blockTab[$blockNo];

    $this->registerBlockInstance($blockInstNo);

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

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

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

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

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

+   if ($btr['firstBlockInstNo'] == -1) {
+   	  $btr['firstBlockInstNo'] = $blockInstNo;
+   }
+   if ($btr['lastBlockInstNo'] != -1) {
+   	  $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'];

+   if ($parentBlockNo == -1) {
+   	  $bitr['parentInstLevel'] = -1;
+   } else {
+		  $bitr['parentInstLevel'] = $this->blockTab[$parentBlockNo]['instances'];
+	}
    $bitr['nextBlockInstNo'] = -1;

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

    // copy instance variables for this block

@@ -687,7 +714,9 @@ 
 */

 function generateOutputToFile($fileName) {

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

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

+   if ($fh === false) {
+   	return false;
+   }
    $this->outputMode = 1;

    $this->outputFileHandle = $fh;

    $ok = $this->generateOutputPage();

@@ -717,14 +746,18 @@ 
 */

 function generateOutputPage() {

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

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

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

+   if ($this->blockTab[0]['instances'] == 0) {
+   	  $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);

-   if ($this->outputError) return false;

+   if ($this->outputError) {
+   	return false;
+   }
    return true; }

 

 /**

@@ -737,11 +770,16 @@ 
    $btr =& $this->blockTab[$blockNo];

    while (!$this->outputError) {

 	  $blockInstNo = $btr['currBlockInstNo'];

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

+	  if ($blockInstNo == -1) {
+	  	break;
+	  }
 	  $bitr =& $this->blockInstTab[$blockInstNo];

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

-		 $this->programLogicError (2);

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

+	  if ($bitr['parentInstLevel'] < $parentInstLevel) {
+	  		 $this->programLogicError (2);
+	  }
+	  if ($bitr['parentInstLevel'] > $parentInstLevel) {
+	  	break;
+	  }
 	  $this->writeBlockInstance ($blockInstNo);

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

 

@@ -774,15 +812,17 @@ 
 		 if ($subBtr['tPosBegin'] < $tPos2) {

 			$tPos2 = $subBtr['tPosBegin'];

 			$kind = 2; }}

-	  if ($tPos2 > $tPos)

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

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

+			if ($vrtr['blockNo'] != $blockNo) {
+						   $this->programLogicError (4);
+			}
 			$variableValue = $bitr['blockVarTab'][$vrtr['blockVarNo']];

 			$this->writeString ($variableValue);

 			$tPos = $vrtr['tPosEnd'];

@@ -790,8 +830,9 @@ 
 			break;

 		 case 2:         // sub block

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

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

-			   $this->programLogicError (3);

+			if ($subBtr['parentBlockNo'] != $blockNo) {
+						   $this->programLogicError (3);
+			}
 			$this->writeBlockInstances ($subBlockNo, $bitr['instanceLevel']);  // recursive call

 			$tPos = $subBtr['tPosEnd'];

 			$subBlockNo += 1;

@@ -801,15 +842,20 @@ 
 * @access private

 */

 function writeString($s) {

-   if ($this->outputError) return;

+   if ($this->outputError) {
+   	return;
+   }
    switch ($this->outputMode) {

 	  case 0:            // output to PHP output stream

-		 if (!print($s))

-			$this->outputError = true;

+		 if (!print($s)) {
+		 			$this->outputError = true;
+		 }
 		 break;

 	  case 1:            // output to file

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

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

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

 	  case 2:            // output to string

 		 $this->outputString .= $s;

@@ -824,7 +870,9 @@ 
 */

 function lookupVariableName($varName, &$varNo) {

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

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

+   if (!isset($x)) {
+   	return false;
+   }
    $varNo = $x;

    return true; }

 

@@ -837,7 +885,9 @@ 
 */

 function lookupBlockName($blockName, &$blockNo) {

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

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

+   if (!isset($x)) {
+   	return false;
+   }
    $blockNo = $x;

    return true; }

 

@@ -851,15 +901,21 @@ 
 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;

+	  if ($s === false) {
+	  	return false;
+	  }
 	  return true; }

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

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

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

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

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

    fclose ($fh);

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

+   if (strlen($s) != $fileSize) {
+   	return false;
+   }
    return true; }

 

 /**

@@ -887,12 +943,22 @@ 
 */

 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;

+   while ($p < $sLen && ord($s{$p}) <= 32) {
+   	$p++;
+   }
+   if ($p >= $sLen) {
+   	return false;
+   }
+   if (substr($s, $p, 1) != '"') {
+   	return false;
+   }
    $p++; $p0 = $p;

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

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

+   while ($p < $sLen && $s{$p} != '"') {
+   	$p++;
+   }
+   if ($p >= $sLen) {
+   	return false;
+   }
    $w = substr($s, $p0, $p - $p0);

    $p++;

    return true; }

@@ -903,25 +969,36 @@ 
 */

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

-	else

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

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

 

 /**

 * Combine two file system paths.

 * @access private

 */

 function combineFileSystemPath ($path1, $path2) {

-   if ($path1 == '' || $path2 == '') return $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);

-	else

-	  $s = $s . $path2;

+   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;
+	}
    return $s; }

 

 /**

lib/accept-to-gettext.php

Spacing +47 added lines, -49 removed lines

@@ -69,17 +69,17 @@ 
 
 /* not really important, this one; perhaps I could've put it inline with
  * the rest. */
-function find_match($curlscore,$curcscore,$curgtlang,$langval,$charval,
+function find_match($curlscore, $curcscore, $curgtlang, $langval, $charval,
 					$gtlang)
 {
-  if($curlscore < $langval) {
-	$curlscore=$langval;
-	$curcscore=$charval;
-	$curgtlang=$gtlang;
+  if ($curlscore < $langval) {
+	$curlscore = $langval;
+	$curcscore = $charval;
+	$curgtlang = $gtlang;
   } else if ($curlscore == $langval) {
-	if($curcscore < $charval) {
-	  $curcscore=$charval;
-	  $curgtlang=$gtlang;
+	if ($curcscore < $charval) {
+	  $curcscore = $charval;
+	  $curgtlang = $gtlang;
 	}
   }
   return array($curlscore, $curcscore, $curgtlang);
@@ -87,22 +87,20 @@ 
 
 function al2gt($gettextlangs, $mime) {
   /* default to "everything is acceptable", as RFC2616 specifies */
-  $acceptLang=(($_SERVER["HTTP_ACCEPT_LANGUAGE"] == '') ? '*' :
-	  $_SERVER["HTTP_ACCEPT_LANGUAGE"]);
-  $acceptChar=(($_SERVER["HTTP_ACCEPT_CHARSET"] == '') ? '*' :
-	  $_SERVER["HTTP_ACCEPT_CHARSET"]);
-  $alparts=@preg_split("/,/",$acceptLang);
-  $acparts=@preg_split("/,/",$acceptChar);
+  $acceptLang = (($_SERVER["HTTP_ACCEPT_LANGUAGE"] == '') ? '*' : $_SERVER["HTTP_ACCEPT_LANGUAGE"]);
+  $acceptChar = (($_SERVER["HTTP_ACCEPT_CHARSET"] == '') ? '*' : $_SERVER["HTTP_ACCEPT_CHARSET"]);
+  $alparts = @preg_split("/,/", $acceptLang);
+  $acparts = @preg_split("/,/", $acceptChar);
   
   /* Parse the contents of the Accept-Language header.*/
-  foreach($alparts as $part) {
-	$part=trim($part);
-	if(preg_match("/;/", $part)) {
-	  $lang=@preg_split("/;/",$part);
-	  $score=@preg_split("/=/",$lang[1]);
-	  $alscores[$lang[0]]=$score[1];
+  foreach ($alparts as $part) {
+	$part = trim($part);
+	if (preg_match("/;/", $part)) {
+	  $lang = @preg_split("/;/", $part);
+	  $score = @preg_split("/=/", $lang[1]);
+	  $alscores[$lang[0]] = $score[1];
 	} else {
-	  $alscores[$part]=1;
+	  $alscores[$part] = 1;
 	}
   }
 
@@ -116,20 +114,20 @@ 
    * Making it 2 for the time being, so that we
    * can distinguish between "not specified" and "specified as 1" later
    * on. */
-  $acscores["ISO-8859-1"]=2;
+  $acscores["ISO-8859-1"] = 2;
 
-  foreach($acparts as $part) {
-	$part=trim($part);
-	if(preg_match("/;/", $part)) {
-	  $cs=@preg_split("/;/",$part);
-	  $score=@preg_split("/=/",$cs[1]);
-	  $acscores[strtoupper($cs[0])]=$score[1];
+  foreach ($acparts as $part) {
+	$part = trim($part);
+	if (preg_match("/;/", $part)) {
+	  $cs = @preg_split("/;/", $part);
+	  $score = @preg_split("/=/", $cs[1]);
+	  $acscores[strtoupper($cs[0])] = $score[1];
 	} else {
-	  $acscores[strtoupper($part)]=1;
+	  $acscores[strtoupper($part)] = 1;
 	}
   }
-  if($acscores["ISO-8859-1"]==2) {
-	$acscores["ISO-8859-1"]=(isset($acscores["*"])?$acscores["*"]:1);
+  if ($acscores["ISO-8859-1"] == 2) {
+	$acscores["ISO-8859-1"] = (isset($acscores["*"]) ? $acscores["*"] : 1);
   }
 
   /* 
@@ -137,18 +135,18 @@ 
    * with the highest score, excluding the ones with a charset the user
    * did not include.
    */
-  $curlscore=0;
-  $curcscore=0;
-  $curgtlang=NULL;
-  foreach($gettextlangs as $gtlang) {
+  $curlscore = 0;
+  $curcscore = 0;
+  $curgtlang = NULL;
+  foreach ($gettextlangs as $gtlang) {
 
-	$tmp1=preg_replace("/\_/","-",$gtlang);
-	$tmp2=@preg_split("/\./",$tmp1);
-	$allang=strtolower($tmp2[0]);
-	$gtcs=strtoupper($tmp2[1]);
-	$noct=@preg_split("/-/",$allang);
+	$tmp1 = preg_replace("/\_/", "-", $gtlang);
+	$tmp2 = @preg_split("/\./", $tmp1);
+	$allang = strtolower($tmp2[0]);
+	$gtcs = strtoupper($tmp2[1]);
+	$noct = @preg_split("/-/", $allang);
 
-	$testvals=array(
+	$testvals = array(
 		 array(@$alscores[$allang], @$acscores[$gtcs]),
 	 array(@$alscores[$noct[0]], @$acscores[$gtcs]),
 	 array(@$alscores[$allang], @$acscores["*"]),
@@ -156,15 +154,15 @@ 
 	 array(@$alscores["*"], @$acscores[$gtcs]),
 	 array(@$alscores["*"], @$acscores["*"]));
 
-	$found=FALSE;
-	foreach($testvals as $tval) {
-	  if(!$found && isset($tval[0]) && isset($tval[1])) {
-		$arr=find_match($curlscore, $curcscore, $curgtlang, $tval[0],
+	$found = FALSE;
+	foreach ($testvals as $tval) {
+	  if (!$found && isset($tval[0]) && isset($tval[1])) {
+		$arr = find_match($curlscore, $curcscore, $curgtlang, $tval[0],
 			  $tval[1], $gtlang);
-		$curlscore=$arr[0];
-		$curcscore=$arr[1];
-		$curgtlang=$arr[2];
-	$found=TRUE;
+		$curlscore = $arr[0];
+		$curcscore = $arr[1];
+		$curgtlang = $arr[2];
+	$found = TRUE;
 	  }
 	}
   }

classes/article.php

Braces +21 added lines, -16 removed lines

@@ -445,10 +445,12 @@ 
 
 								if (!$hide_images) {
 									$encsize = '';
-									if ($entry['height'] > 0)
-										$encsize .= ' height="'.intval($entry['height']).'"';
-									if ($entry['width'] > 0)
-										$encsize .= ' width="'.intval($entry['width']).'"';
+									if ($entry['height'] > 0) {
+																			$encsize .= ' height="'.intval($entry['height']).'"';
+									}
+									if ($entry['width'] > 0) {
+																			$encsize .= ' width="'.intval($entry['width']).'"';
+									}
 									$rv .= "<p><img
 										alt=\"".htmlspecialchars($entry["filename"])."\"
 										src=\"" .htmlspecialchars($entry["url"])."\"
@@ -480,15 +482,17 @@ 
 			$rv .= "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 
 			foreach ($entries as $entry) {
-				if ($entry["title"])
-					$title = " &mdash; ".truncate_string($entry["title"], 30);
-				else
-					$title = "";
+				if ($entry["title"]) {
+									$title = " &mdash; ".truncate_string($entry["title"], 30);
+				} else {
+									$title = "";
+				}
 
-				if ($entry["filename"])
-					$filename = truncate_middle(htmlspecialchars($entry["filename"]), 60);
-				else
-					$filename = "";
+				if ($entry["filename"]) {
+									$filename = truncate_middle(htmlspecialchars($entry["filename"]), 60);
+				} else {
+									$filename = "";
+				}
 
 				$rv .= "<div onclick='popupOpenUrl(\"".htmlspecialchars($entry["url"])."\")'
 					dojoType=\"dijit.MenuItem\">".$filename.$title."</div>";
@@ -639,10 +643,11 @@ 
 
 		// purge orphaned posts in main content table
 
-		if (DB_TYPE == "mysql")
-			$limit_qpart = "LIMIT 5000";
-		else
-			$limit_qpart = "";
+		if (DB_TYPE == "mysql") {
+					$limit_qpart = "LIMIT 5000";
+		} else {
+					$limit_qpart = "";
+		}
 
 		$pdo = Db::pdo();
 		$res = $pdo->query("DELETE FROM ttrss_entries WHERE

classes/api.php

Spacing +2 added lines, -2 removed lines

@@ -196,13 +196,13 @@
 				$feed_id = (int) $feed_id;
 			}
 
-			$limit = (int)clean($_REQUEST["limit"]);
+			$limit = (int) clean($_REQUEST["limit"]);
 
 			if (!$limit || $limit >= 200) {
 				$limit = 200;
 			}
 
-			$offset = (int)clean($_REQUEST["skip"]);
+			$offset = (int) clean($_REQUEST["skip"]);
 			$filter = clean($_REQUEST["filter"]);
 			$is_cat = API::param_to_bool(clean($_REQUEST["is_cat"]));
 			$show_excerpt = API::param_to_bool(clean($_REQUEST["show_excerpt"]));

classes/handler/public.php

Spacing +1 added lines, -1 removed lines

@@ -391,7 +391,7 @@
 			list ($og_image, $og_stream) = Article::get_article_image($enclosures, $line['content'], $line["site_url"]);
 
 			if ($og_image) {
-				$rv .= "<meta property='og:image' content=\"" . htmlspecialchars($og_image) . "\"/>";
+				$rv .= "<meta property='og:image' content=\"".htmlspecialchars($og_image)."\"/>";
 			}
 
 			$rv .= "<body class='flat ttrss_utility ttrss_zoom'>";

classes/feedparser.php

Braces +3 added lines, -1 removed lines

@@ -26,8 +26,10 @@
 		if ($error) {
 			foreach (libxml_get_errors() as $error) {
 				if ($error->level == LIBXML_ERR_FATAL) {
-					if (!isset($this->error)) //currently only the first error is reported
+					if (!isset($this->error)) {
+						//currently only the first error is reported
 						$this->error = $this->format_error($error);
+					}
 					$this->libxml_errors [] = $this->format_error($error);
 				}
 			}

classes/feeds.php

Switch Indentation +20 added lines, -20 removed lines

@@ -1235,28 +1235,28 @@
 
 	public static function getFeedIcon($id) {
 		switch ($id) {
-			case 0:
-				return "archive";
-			case -1:
-				return "star";
-			case -2:
-				return "rss_feed";
-			case -3:
-				return "whatshot";
-			case -4:
-				return "inbox";
-			case -6:
-				return "restore";
-			default:
-				if ($id < LABEL_BASE_INDEX) {
-					return "label";
-				} else {
-					$icon = self::getIconFile($id);
+		case 0:
+			return "archive";
+		case -1:
+			return "star";
+		case -2:
+			return "rss_feed";
+		case -3:
+			return "whatshot";
+		case -4:
+			return "inbox";
+		case -6:
+			return "restore";
+		default:
+			if ($id < LABEL_BASE_INDEX) {
+				return "label";
+			} else {
+				$icon = self::getIconFile($id);
 
-					if ($icon && file_exists($icon)) {
-						return ICONS_URL . "/" . basename($icon) . "?" . filemtime($icon);
-					}
+				if ($icon && file_exists($icon)) {
+					return ICONS_URL . "/" . basename($icon) . "?" . filemtime($icon);
 				}
+			}
 		}
 
 		return false;

Spacing +12 added lines, -12 removed lines

@@ -333,10 +333,10 @@ 
 				if (!get_pref("CDM_EXPANDED")) {
 					$line["cdm_excerpt"] = "<span class='collapse'>
                         <i class='material-icons' onclick='return Article.cdmUnsetActive(event)'
-                            title=\"" . __("Collapse article") . "\">remove_circle</i></span>";
+                            title=\"" . __("Collapse article")."\">remove_circle</i></span>";
 
 					if (get_pref('SHOW_CONTENT_PREVIEW')) {
-						$line["cdm_excerpt"] .= "<span class='excerpt'>" . $line["content_preview"] . "</span>";
+						$line["cdm_excerpt"] .= "<span class='excerpt'>".$line["content_preview"]."</span>";
 					}
 				}
 
@@ -350,11 +350,11 @@ 
 					$ofgh->execute([$line["orig_feed_id"], $_SESSION['uid']]);
 
 					if ($tmp_line = $ofgh->fetch()) {
-						$line["orig_feed"] = [ $tmp_line["title"], $tmp_line["site_url"], $tmp_line["feed_url"] ];
+						$line["orig_feed"] = [$tmp_line["title"], $tmp_line["site_url"], $tmp_line["feed_url"]];
 					}
 				}
 
-				$line["updated_long"] = make_local_datetime($line["updated"],true);
+				$line["updated_long"] = make_local_datetime($line["updated"], true);
 				$line["updated"] = make_local_datetime($line["updated"], false, false, false, true);
 
 
@@ -389,7 +389,7 @@ 
 				}
 
 				if (isset($rgba_cache[$feed_id])) {
-					$line['feed_bg_color'] = 'rgba(' . implode(",", $rgba_cache[$feed_id]) . ',0.3)';
+					$line['feed_bg_color'] = 'rgba('.implode(",", $rgba_cache[$feed_id]).',0.3)';
 				}
 
 				/* we don't need those */
@@ -1254,7 +1254,7 @@ 
 					$icon = self::getIconFile($id);
 
 					if ($icon && file_exists($icon)) {
-						return ICONS_URL . "/" . basename($icon) . "?" . filemtime($icon);
+						return ICONS_URL."/".basename($icon)."?".filemtime($icon);
 					}
 				}
 		}
@@ -1951,9 +1951,9 @@ 
 	}
 
 	function color_of($name) {
-		$colormap = [ "#1cd7d7","#d91111","#1212d7","#8e16e5","#7b7b7b",
-			"#39f110","#0bbea6","#ec0e0e","#1534f2","#b9e416",
-			"#479af2","#f36b14","#10c7e9","#1e8fe7","#e22727" ];
+		$colormap = ["#1cd7d7", "#d91111", "#1212d7", "#8e16e5", "#7b7b7b",
+			"#39f110", "#0bbea6", "#ec0e0e", "#1534f2", "#b9e416",
+			"#479af2", "#f36b14", "#10c7e9", "#1e8fe7", "#e22727"];
 
 		$sum = 0;
 
@@ -2260,7 +2260,7 @@ 
 			case "title":
 				if ($commandpair[1]) {
 					array_push($query_keywords, "($not (LOWER(ttrss_entries.title) LIKE ".
-						$pdo->quote('%' . mb_strtolower($commandpair[1]) . '%') ."))");
+						$pdo->quote('%'.mb_strtolower($commandpair[1]).'%')."))");
 				} else {
 					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
@@ -2270,7 +2270,7 @@ 
 			case "author":
 				if ($commandpair[1]) {
 					array_push($query_keywords, "($not (LOWER(author) LIKE ".
-						$pdo->quote('%' . mb_strtolower($commandpair[1]) . '%')."))");
+						$pdo->quote('%'.mb_strtolower($commandpair[1]).'%')."))");
 				} else {
 					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
@@ -2285,7 +2285,7 @@ 
 						array_push($query_keywords, "($not (note IS NULL OR note = ''))");
 					else
 						array_push($query_keywords, "($not (LOWER(note) LIKE ".
-							$pdo->quote('%' . mb_strtolower($commandpair[1]) . '%')."))");
+							$pdo->quote('%'.mb_strtolower($commandpair[1]).'%')."))");
 				} else {
 					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");

Braces +54 added lines, -33 removed lines

@@ -50,8 +50,9 @@ 
 			$reply .= strip_tags($feed_title);
 		}
 
-		if ($error)
-			$reply .= " <i title=\"".htmlspecialchars($error)."\" class='material-icons icon-error'>error</i>";
+		if ($error) {
+					$reply .= " <i title=\"".htmlspecialchars($error)."\" class='material-icons icon-error'>error</i>";
+		}
 
 		$reply .= "</span>";
 		$reply .= "<span id='feed_current_unread' style='display: none'></span>";
@@ -325,10 +326,11 @@ 
 
 				$line['content'] = DiskCache::rewriteUrls($line['content']);
 
-				if ($line['note'])
-					$line['note'] = Article::format_article_note($id, $line['note']);
-				else
-					$line['note'] = "";
+				if ($line['note']) {
+									$line['note'] = Article::format_article_note($id, $line['note']);
+				} else {
+									$line['note'] = "";
+				}
 
 				if (!get_pref("CDM_EXPANDED")) {
 					$line["cdm_excerpt"] = "<span class='collapse'>
@@ -395,8 +397,9 @@ 
 				/* we don't need those */
 
 				foreach (["date_entered", "guid", "last_published", "last_marked", "tag_cache", "favicon_avg_color",
-							 "uuid", "label_cache", "yyiw"] as $k)
-					unset($line[$k]);
+							 "uuid", "label_cache", "yyiw"] as $k) {
+									unset($line[$k]);
+				}
 
 				array_push($reply['content'], $line);
 			}
@@ -1310,13 +1313,17 @@ 
 
 	public static function getCategoryUnread($cat, $owner_uid = false) {
 
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+		if (!$owner_uid) {
+			$owner_uid = $_SESSION["uid"];
+		}
 
 		$pdo = Db::pdo();
 
 		if ($cat >= 0) {
 
-			if (!$cat) $cat = null;
+			if (!$cat) {
+				$cat = null;
+			}
 
 			$sth = $pdo->prepare("SELECT id FROM ttrss_feeds
                     WHERE (cat_id = :cat OR (:cat IS NULL AND cat_id IS NULL))
@@ -2279,56 +2286,68 @@ 
 				break;
 			case "note":
 				if ($commandpair[1]) {
-					if ($commandpair[1] == "true")
-						array_push($query_keywords, "($not (note IS NOT NULL AND note != ''))");
-					else if ($commandpair[1] == "false")
-						array_push($query_keywords, "($not (note IS NULL OR note = ''))");
-					else
-						array_push($query_keywords, "($not (LOWER(note) LIKE ".
+					if ($commandpair[1] == "true") {
+											array_push($query_keywords, "($not (note IS NOT NULL AND note != ''))");
+					} else if ($commandpair[1] == "false") {
+											array_push($query_keywords, "($not (note IS NULL OR note = ''))");
+					} else {
+											array_push($query_keywords, "($not (LOWER(note) LIKE ".
 							$pdo->quote('%' . mb_strtolower($commandpair[1]) . '%')."))");
+					}
 				} else {
 					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-					if (!$not) array_push($search_words, $k);
+					if (!$not) {
+						array_push($search_words, $k);
+					}
 				}
 				break;
 			case "star":
 
 				if ($commandpair[1]) {
-					if ($commandpair[1] == "true")
-						array_push($query_keywords, "($not (marked = true))");
-					else
-						array_push($query_keywords, "($not (marked = false))");
+					if ($commandpair[1] == "true") {
+											array_push($query_keywords, "($not (marked = true))");
+					} else {
+											array_push($query_keywords, "($not (marked = false))");
+					}
 				} else {
 					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-					if (!$not) array_push($search_words, $k);
+					if (!$not) {
+						array_push($search_words, $k);
+					}
 				}
 				break;
 			case "pub":
 				if ($commandpair[1]) {
-					if ($commandpair[1] == "true")
-						array_push($query_keywords, "($not (published = true))");
-					else
-						array_push($query_keywords, "($not (published = false))");
+					if ($commandpair[1] == "true") {
+											array_push($query_keywords, "($not (published = true))");
+					} else {
+											array_push($query_keywords, "($not (published = false))");
+					}
 
 				} else {
 					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-					if (!$not) array_push($search_words, $k);
+					if (!$not) {
+						array_push($search_words, $k);
+					}
 				}
 				break;
 			case "unread":
 				if ($commandpair[1]) {
-					if ($commandpair[1] == "true")
-						array_push($query_keywords, "($not (unread = true))");
-					else
-						array_push($query_keywords, "($not (unread = false))");
+					if ($commandpair[1] == "true") {
+											array_push($query_keywords, "($not (unread = true))");
+					} else {
+											array_push($query_keywords, "($not (unread = false))");
+					}
 
 				} else {
 					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-					if (!$not) array_push($search_words, $k);
+					if (!$not) {
+						array_push($search_words, $k);
+					}
 				}
 				break;
 			default:
@@ -2351,7 +2370,9 @@ 
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
 					}
 
-					if (!$not) array_push($search_words, $k);
+					if (!$not) {
+						array_push($search_words, $k);
+					}
 				}
 			}
 		}

classes/db.php

Spacing +3 added lines, -3 removed lines

@@ -31,18 +31,18 @@
 			$this->adapter = new Db_Pgsql();
 			break;
 		default:
-			die("Unknown DB_TYPE: " . DB_TYPE);
+			die("Unknown DB_TYPE: ".DB_TYPE);
 		}
 
 		if (!$this->adapter) {
-			print("Error initializing database adapter for " . DB_TYPE);
+			print("Error initializing database adapter for ".DB_TYPE);
 			exit(100);
 		}
 
 		$this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, defined('DB_PORT') ? DB_PORT : "");
 
 		if (!$this->link) {
-			print("Error connecting through adapter: " . $this->adapter->last_error());
+			print("Error connecting through adapter: ".$this->adapter->last_error());
 			exit(101);
 		}
 

classes/pref/feeds.php

Spacing +15 added lines, -15 removed lines

@@ -1072,57 +1072,57 @@ 
 
 				switch ($k) {
 				case "title":
-					$qpart = "title = " . $this->pdo->quote($feed_title);
+					$qpart = "title = ".$this->pdo->quote($feed_title);
 					break;
 
 				case "feed_url":
-					$qpart = "feed_url = " . $this->pdo->quote($feed_url);
+					$qpart = "feed_url = ".$this->pdo->quote($feed_url);
 					break;
 
 				case "update_interval":
-					$qpart = "update_interval = " . $this->pdo->quote($upd_intl);
+					$qpart = "update_interval = ".$this->pdo->quote($upd_intl);
 					break;
 
 				case "purge_interval":
-					$qpart = "purge_interval =" . $this->pdo->quote($purge_intl);
+					$qpart = "purge_interval =".$this->pdo->quote($purge_intl);
 					break;
 
 				case "auth_login":
-					$qpart = "auth_login = " . $this->pdo->quote($auth_login);
+					$qpart = "auth_login = ".$this->pdo->quote($auth_login);
 					break;
 
 				case "auth_pass":
-					$qpart = "auth_pass =" . $this->pdo->quote($auth_pass). ", auth_pass_encrypted = false";
+					$qpart = "auth_pass =".$this->pdo->quote($auth_pass).", auth_pass_encrypted = false";
 					break;
 
 				case "private":
-					$qpart = "private = " . $this->pdo->quote($private);
+					$qpart = "private = ".$this->pdo->quote($private);
 					break;
 
 				case "include_in_digest":
-					$qpart = "include_in_digest = " . $this->pdo->quote($include_in_digest);
+					$qpart = "include_in_digest = ".$this->pdo->quote($include_in_digest);
 					break;
 
 				case "always_display_enclosures":
-					$qpart = "always_display_enclosures = " . $this->pdo->quote($always_display_enclosures);
+					$qpart = "always_display_enclosures = ".$this->pdo->quote($always_display_enclosures);
 					break;
 
 				case "mark_unread_on_update":
-					$qpart = "mark_unread_on_update = " . $this->pdo->quote($mark_unread_on_update);
+					$qpart = "mark_unread_on_update = ".$this->pdo->quote($mark_unread_on_update);
 					break;
 
 				case "cache_images":
-					$qpart = "cache_images = " . $this->pdo->quote($cache_images);
+					$qpart = "cache_images = ".$this->pdo->quote($cache_images);
 					break;
 
 				case "hide_images":
-					$qpart = "hide_images = " . $this->pdo->quote($hide_images);
+					$qpart = "hide_images = ".$this->pdo->quote($hide_images);
 					break;
 
 				case "cat_id":
 					if (get_pref('ENABLE_FEED_CATS')) {
 						if ($cat_id) {
-							$qpart = "cat_id = " . $this->pdo->quote($cat_id);
+							$qpart = "cat_id = ".$this->pdo->quote($cat_id);
 						} else {
 							$qpart = 'cat_id = NULL';
 						}
@@ -1133,7 +1133,7 @@ 
 					break;
 
 				case "feed_language":
-					$qpart = "feed_language = " . $this->pdo->quote($feed_language);
+					$qpart = "feed_language = ".$this->pdo->quote($feed_language);
 					break;
 
 				}
@@ -1579,7 +1579,7 @@ 
 
 	public static function remove_feed($id, $owner_uid) {
 		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_UNSUBSCRIBE_FEED) as $p) {
-			if (! $p->hook_unsubscribe_feed($id, $owner_uid)) {
+			if (!$p->hook_unsubscribe_feed($id, $owner_uid)) {
 				user_error("Feed $id (owner: $owner_uid) not removed due to plugin error (HOOK_UNSUBSCRIBE_FEED).", E_USER_WARNING);
 				return;
 			}