codysnider / tt-rss

lib/phpqrcode/qrspec.php

Indentation +2 added lines, -2 removed lines

@@ -335,10 +335,10 @@
 

         // Version information pattern -----------------------------------------

 

-		// Version information pattern (BCH coded).

+        // Version information pattern (BCH coded).

         // See Table 1 in Appendix D (pp.68) of JIS X0510:2004.

         

-		// size: [QRSPEC_VERSION_MAX - 6]

+        // size: [QRSPEC_VERSION_MAX - 6]

 		

         public static $versionPattern = array(

             0x07c94, 0x085bc, 0x09a99, 0x0a4d3, 0x0bbf6, 0x0c762, 0x0d847, 0x0e60d,

lib/phpqrcode/qrmask.php

Indentation +8 added lines, -8 removed lines

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

  */

  

-	define('N1', 3);

-	define('N2', 3);

-	define('N3', 40);

-	define('N4', 10);

+    define('N1', 3);

+    define('N2', 3);

+    define('N3', 40);

+    define('N4', 10);

 

-	class QRmask {

+    class QRmask {

 	

-		public $runLength = array();

+        public $runLength = array();

 		

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

-		public function __construct() 

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

+        public function __construct() 

         {

             $this->runLength = array_fill(0, QRSPEC_WIDTH_MAX + 1, 0);

         }

lib/MiniTemplator.class.php

Indentation +383 added lines, -383 removed lines

@@ -161,7 +161,7 @@ 
 * @access public

 */

 function __construct() {

-   $this->templateValid = false; }

+    $this->templateValid = false; }

 

 //--- template string handling --------------------------------------------------------------------------------------

 

@@ -172,11 +172,11 @@ 
 * @access public

 */

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

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

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

+        return false; }

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

+    return true; }

 

 /**

 * Assigns a new template string.

@@ -185,12 +185,12 @@ 
 * @access public

 */

 function setTemplateString ($templateString) {

-   $this->templateValid = false;

-   $this->template = $templateString;

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

-   $this->reset();

-   $this->templateValid = true;

-   return true; }

+    $this->templateValid = false;

+    $this->template = $templateString;

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

+    $this->reset();

+    $this->templateValid = true;

+    return true; }

 

 /**

 * Loads the template string for a subtemplate (used for the $Include command).

@@ -198,11 +198,11 @@ 
 * @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 . ".");

-      return false; }

-   return true; }

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

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

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

+        return false; }

+    return true; }

 

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

 

@@ -212,28 +212,28 @@ 
 * @access private

 */

 function parseTemplate() {

-   $this->initParsing();

-   $this->beginMainBlock();

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

-   $this->endMainBlock();

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

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

-   $this->associateVariablesWithBlocks();

-   return true; }

+    $this->initParsing();

+    $this->beginMainBlock();

+    if (!$this->parseTemplateCommands()) return false;

+    $this->endMainBlock();

+    if (!$this->checkBlockDefinitionsComplete()) return false;

+    if (!$this->parseTemplateVariables()) return false;

+    $this->associateVariablesWithBlocks();

+    return true; }

 

 /**

 * @access private

 */

 function initParsing() {

-   $this->varTab = array();

-   $this->varTabCnt = 0;

-   $this->varNameToNoMap = array();

-   $this->varRefTab = array();

-   $this->varRefTabCnt = 0;

-   $this->blockTab = array();

-   $this->blockTabCnt = 0;

-   $this->blockNameToNoMap = array();

-   $this->openBlocksTab = array(); }

+    $this->varTab = array();

+    $this->varTabCnt = 0;

+    $this->varNameToNoMap = array();

+    $this->varRefTab = array();

+    $this->varRefTabCnt = 0;

+    $this->blockTab = array();

+    $this->blockTabCnt = 0;

+    $this->blockNameToNoMap = array();

+    $this->openBlocksTab = array(); }

 

 /**

 * Registers the main block.

@@ -241,27 +241,27 @@ 
 * @access private

 */

 function beginMainBlock() {

-   $blockNo = 0;

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

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

-   $bte['tPosBegin'] = 0;

-   $bte['tPosContentsBegin'] = 0;

-   $bte['nestingLevel'] = 0;

-   $bte['parentBlockNo'] = -1;

-   $bte['definitionIsOpen'] = true;

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

-   $this->currentNestingLevel = 1; }

+    $blockNo = 0;

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

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

+    $bte['tPosBegin'] = 0;

+    $bte['tPosContentsBegin'] = 0;

+    $bte['nestingLevel'] = 0;

+    $bte['parentBlockNo'] = -1;

+    $bte['definitionIsOpen'] = true;

+    $this->openBlocksTab[0] = $blockNo;

+    $this->currentNestingLevel = 1; }

 

 /**

 * Completes the main block registration.

 * @access private

 */

 function endMainBlock() {

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

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

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

-   $bte['definitionIsOpen'] = false;

-   $this->currentNestingLevel -= 1; }

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

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

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

+    $bte['definitionIsOpen'] = false;

+    $this->currentNestingLevel -= 1; }

 

 /**

 * Parses commands within the template in the format "<!-- $command parameters -->".

@@ -269,46 +269,46 @@ 
 * @access private

 */

 function parseTemplateCommands() {

-   $p = 0;

-   while (true) {

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

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

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

-      if ($p === false) {

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

-         return false; }

-      $p += 3;

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

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

-         return false;

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

-   return true; }

+    $p = 0;

+    while (true) {

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

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

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

+        if ($p === false) {

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

+            return false; }

+        $p += 3;

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

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

+            return false;

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

+    return true; }

 

 /**

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

 * @access private

 */

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

-   $resumeFromStart = false;

-   $p = 0;

-   $cmd = '';

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

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

-   switch (strtoupper($cmd)) {

-      case '$BEGINBLOCK':

+    $resumeFromStart = false;

+    $p = 0;

+    $cmd = '';

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

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

+    switch (strtoupper($cmd)) {

+        case '$BEGINBLOCK':

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

             return false;

-         break;

-      case '$ENDBLOCK':

+            break;

+        case '$ENDBLOCK':

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

             return false;

-         break;

-      case '$INCLUDE':

+            break;

+        case '$INCLUDE':

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

             return false;

-         $resumeFromStart = true;

-         break;

-      default:

+            $resumeFromStart = true;

+            break;

+        default:

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

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

             return false; }}

@@ -320,25 +320,25 @@ 
 * @access private

 */

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

-   $p = 0;

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

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

-      return false; }

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

-   $btr['tPosBegin'] = $cmdTPosBegin;

-   $btr['tPosContentsBegin'] = $cmdTPosEnd;

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

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

-      return false; }

-   return true; }

+    $p = 0;

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

+        return false; }

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

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

+    $this->currentNestingLevel += 1;

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

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

+        return false; }

+    return true; }

 

 /**

 * Processes the $EndBlock command.

@@ -346,47 +346,47 @@ 
 * @access private

 */

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

-   $p = 0;

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

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

-      return false; }

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

-      return false; }

-   $this->currentNestingLevel -= 1;

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

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

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

-      return false; }

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

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

-      return false; }

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

-   $btr['tPosEnd'] = $cmdTPosEnd;

-   $btr['definitionIsOpen'] = false;

-   return true; }

+    $p = 0;

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

+        return false; }

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

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

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

+        return false; }

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

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

+        return false; }

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

+    $btr['tPosEnd'] = $cmdTPosEnd;

+    $btr['definitionIsOpen'] = false;

+    return true; }

 

 /**

 * @access private

 */

 function registerBlock($blockName, &$blockNo) {

-   $blockNo = $this->blockTabCnt++;

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

-   $btr = array();

-   $btr['blockName'] = $blockName;

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

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

-   $btr['definitionIsOpen'] = true;

-   $btr['instances'] = 0;

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

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

-   $btr['blockVarCnt'] = 0;

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

-   $btr['blockVarNoToVarNoMap'] = array();

-   $this->blockNameToNoMap[strtoupper($blockName)] = $blockNo; }

+    $blockNo = $this->blockTabCnt++;

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

+    $btr = array();

+    $btr['blockName'] = $blockName;

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

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

+    $btr['definitionIsOpen'] = true;

+    $btr['instances'] = 0;

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

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

+    $btr['blockVarCnt'] = 0;

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

+    $btr['blockVarNoToVarNoMap'] = array();

+    $this->blockNameToNoMap[strtoupper($blockName)] = $blockNo; }

 

 /**

 * Checks that all block definitions are closed.

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

 */

 function checkBlockDefinitionsComplete() {

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

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

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

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

-         return false; }}

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

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

-      return false; }

-   return true; }

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

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

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

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

+            return false; }}

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

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

+        return false; }

+    return true; }

 

 /**

 * Processes the $Include command.

@@ -410,14 +410,14 @@ 
 * @access private

 */

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

-   $p = 0;

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

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

-      return false; }

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

+    $p = 0;

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

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

+        return false; }

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

 

 /**

 * Processes the $Include command.

@@ -425,14 +425,14 @@ 
 * @access private

 */

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

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

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

-      return false; }

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

-   return true; }

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

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

+    return true; }

 

 /**

 * Parses variable references within the template in the format "${VarName}".

@@ -440,77 +440,77 @@ 
 * @access private

 */

 function parseTemplateVariables() {

-   $p = 0;

-   while (true) {

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

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

-      $p0 = $p;

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

-      if ($p === false) {

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

-         return false; }

-      $p += 1;

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

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

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

-         return false; }

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

-   return true; }

+    $p = 0;

+    while (true) {

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

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

+        $p0 = $p;

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

+        if ($p === false) {

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

+            return false; }

+        $p += 1;

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

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

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

+            return false; }

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

+    return true; }

 

 /**

 * @access private

 */

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

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

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

-   $varRefNo = $this->varRefTabCnt++;

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

-   $vrtr = array();

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

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

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

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

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

+    $varRefNo = $this->varRefTabCnt++;

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

+    $vrtr = array();

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

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

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

 

 /**

 * @access private

 */

 function registerVariable ($varName, &$varNo) {

-   $varNo = $this->varTabCnt++;

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

-   $vtr = array();

-   $vtr['varName'] = $varName;

-   $vtr['varValue'] = '';

-   $this->varNameToNoMap[strtoupper($varName)] = $varNo; }

+    $varNo = $this->varTabCnt++;

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

+    $vtr = array();

+    $vtr['varName'] = $varName;

+    $vtr['varValue'] = '';

+    $this->varNameToNoMap[strtoupper($varName)] = $varNo; }

 

 /**

 * Associates variable references with blocks.

 * @access private

 */

 function associateVariablesWithBlocks() {

-   $varRefNo = 0;

-   $activeBlockNo = 0;

-   $nextBlockNo = 1;

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

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

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

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

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

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

-         continue; }

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

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

+    $varRefNo = 0;

+    $activeBlockNo = 0;

+    $nextBlockNo = 1;

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

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

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

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

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

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

+            continue; }

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

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

             $activeBlockNo = $nextBlockNo;

             $nextBlockNo += 1;

             continue; }}

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

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

-         $this->programLogicError(1);

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

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

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

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

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

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

-      $varRefNo += 1; }}

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

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

+            $this->programLogicError(1);

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

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

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

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

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

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

+        $varRefNo += 1; }}

 

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

 

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

 */

 function reset() {

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

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

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

-   $this->blockInstTab = array();

-   $this->blockInstTabCnt = 0; }

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

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

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

+    $this->blockInstTab = array();

+    $this->blockInstTabCnt = 0; }

 

 /**

 * Sets a template variable.

@@ -549,13 +549,13 @@ 
 * @access public

 */

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

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

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

-      if ($isOptional) return true;

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

-      return false; }

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

-   return true; }

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

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

+        if ($isOptional) return true;

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

+        return false; }

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

+    return true; }

 

 /**

 * Sets a template variable to an escaped string.

@@ -576,7 +576,7 @@ 
 * @access public

 */

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

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

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

 

 /**

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

@@ -586,8 +586,8 @@ 
 * @access public

 */

 function variableExists ($variableName) {

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

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

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

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

 

 /**

 * Adds an instance of a template block.

@@ -603,48 +603,48 @@ 
 * @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.");

-      return false; }

-   while ($blockNo != -1) {

-      $this->addBlockByNo($blockNo);

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

-   return true; }

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

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

+    return true; }

 

 /**

 * @access private

 */

 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)

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

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

+            // set forward pointer of chain

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

+    $parentBlockNo = $btr['parentBlockNo'];

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

+    $bitr['blockNo'] = $blockNo;

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

+    if ($parentBlockNo == -1)

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

     else

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

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

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

-   // copy instance variables for this block

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

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

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

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

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

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

+    // copy instance variables for this block

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

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

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

 

 /**

 * @access private

 */

 function registerBlockInstance (&$blockInstNo) {

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

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

 

 /**

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

@@ -654,8 +654,8 @@ 
 * @access public

 */

 function blockExists ($blockName) {

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

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

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

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

 

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

 

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

 */

 function generateOutput () {

-   $this->outputMode = 0;

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

-   return true; }

+    $this->outputMode = 0;

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

+    return true; }

 

 /**

 * Generates the HTML page and writes it to a file.

@@ -676,13 +676,13 @@ 
 * @access public

 */

 function generateOutputToFile ($fileName) {

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

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

-   $this->outputMode = 1;

-   $this->outputFileHandle = $fh;

-   $ok = $this->generateOutputPage();

-   fclose ($fh);

-   return $ok; }

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

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

+    $this->outputMode = 1;

+    $this->outputFileHandle = $fh;

+    $ok = $this->generateOutputPage();

+    fclose ($fh);

+    return $ok; }

 

 /**

 * Generates the HTML page and writes it to a string.

@@ -692,28 +692,28 @@ 
 * @access public

 */

 function generateOutputToString (&$outputString) {

-   $outputString = "Error";

-   $this->outputMode = 2;

-   $this->outputString = "";

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

-   $outputString = $this->outputString;

-   return true; }

+    $outputString = "Error";

+    $this->outputMode = 2;

+    $this->outputString = "";

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

+    $outputString = $this->outputString;

+    return true; }

 

 /**

 * @access private

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

 */

 function generateOutputPage() {

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

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

-   $this->outputError = false;

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

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

-   return true; }

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

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

+    $this->outputError = false;

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

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

+    return true; }

 

 /**

 * Writes all instances of a block that are contained within a specific

@@ -722,64 +722,64 @@ 
 * @access private

 */

 function writeBlockInstances ($blockNo, $parentInstLevel) {

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

-   while (!$this->outputError) {

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

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

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

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

-         $this->programLogicError (2);

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

-      $this->writeBlockInstance ($blockInstNo);

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

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

+    while (!$this->outputError) {

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

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

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

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

+            $this->programLogicError (2);

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

+        $this->writeBlockInstance ($blockInstNo);

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

 

 /**

 * @access private

 */

 function writeBlockInstance($blockInstNo) {

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

-   $blockNo = $bitr['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

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

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

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

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

+    $blockNo = $bitr['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

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

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

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

             $varRefNo += 1;

             continue; }

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

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

             $tPos2 = $vrtr['tPosBegin'];

             $kind = 1; }}

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

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

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

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

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

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

             $subBlockNo += 1;

             continue; }

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

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

             $tPos2 = $subBtr['tPosBegin'];

             $kind = 2; }}

-      if ($tPos2 > $tPos)

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

-      switch ($kind) {

-         case 0:         // end of block

+        if ($tPos2 > $tPos)

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

+        switch ($kind) {

+            case 0:         // end of block

             return;

-         case 1:         // variable

+            case 1:         // variable

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

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

-               $this->programLogicError (4);

+                $this->programLogicError (4);

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

             $this->writeString ($variableValue);

             $tPos = $vrtr['tPosEnd'];

             $varRefNo += 1;

             break;

-         case 2:         // sub block

+            case 2:         // sub block

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

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

-               $this->programLogicError (3);

+                $this->programLogicError (3);

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

             $tPos = $subBtr['tPosEnd'];

             $subBlockNo += 1;

@@ -789,19 +789,19 @@ 
 * @access private

 */

 function writeString ($s) {

-   if ($this->outputError) return;

-   switch ($this->outputMode) {

-      case 0:            // output to PHP output stream

+    if ($this->outputError) return;

+    switch ($this->outputMode) {

+        case 0:            // output to PHP output stream

          if (!print($s))

             $this->outputError = true;

-         break;

-      case 1:            // output to file

+            break;

+        case 1:            // output to file

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

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

-         break;

-      case 2:            // output to string

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

+            break;

+        case 2:            // output to string

          $this->outputString .= $s;

-         break; }}

+            break; }}

 

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

 

@@ -811,10 +811,10 @@ 
 * @access private

 */

 function lookupVariableName ($varName, &$varNo) {

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

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

-   $varNo = $x;

-   return true; }

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

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

+    $varNo = $x;

+    return true; }

 

 /**

 * Maps block name to block number.

@@ -824,10 +824,10 @@ 
 * @access private

 */

 function lookupBlockName ($blockName, &$blockNo) {

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

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

-   $blockNo = $x;

-   return true; }

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

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

+    $blockNo = $x;

+    return true; }

 

 //--- general utility routines -----------------------------------------------------------------------------------------

 

@@ -837,86 +837,86 @@ 
 * @access private

 */

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

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

-   return true; }

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

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

+    return true; }

 

 /**

 * @access private

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

 */

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

-   $sLen = strlen($s);

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

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

-   $p0 = $p;

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

-   $w = substr($s, $p0, $p - $p0);

-   return true; }

+    $sLen = strlen($s);

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

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

+    $p0 = $p;

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

+    $w = substr($s, $p0, $p - $p0);

+    return true; }

 

 /**

 * @access private

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

 */

 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;

-   $p++; $p0 = $p;

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

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

-   $w = substr($s, $p0, $p - $p0);

-   $p++;

-   return true; }

+    $sLen = strlen($s);

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

+    $w = substr($s, $p0, $p - $p0);

+    $p++;

+    return true; }

 

 /**

 * @access private

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

 */

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

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

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

 

 /**

 * Combine two file system paths.

 * @access private

 */

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

-   return $s; }

+        $s = $s . $path2;

+    return $s; }

 

 /**

 * @access private

 */

 function triggerError ($msg) {

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

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

 

 /**

 * @access private

 */

 function programLogicError ($errorId) {

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

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

 

 }

 ?>

index.php

Indentation +60 added lines, -60 removed lines

@@ -1,36 +1,36 @@ 
 <?php
-	if (file_exists("install") && !file_exists("config.php")) {
-		header("Location: install/");
-	}
+    if (file_exists("install") && !file_exists("config.php")) {
+        header("Location: install/");
+    }
 
-	if (!file_exists("config.php")) {
-		print "<b>Fatal Error</b>: You forgot to copy
+    if (!file_exists("config.php")) {
+        print "<b>Fatal Error</b>: You forgot to copy
 		<b>config.php-dist</b> to <b>config.php</b> and edit it.\n";
-		exit;
-	}
+        exit;
+    }
 
-	// we need a separate check here because functions.php might get parsed
-	// incorrectly before 5.3 because of :: syntax.
-	if (version_compare(PHP_VERSION, '5.6.0', '<')) {
-		print "<b>Fatal Error</b>: PHP version 5.6.0 or newer required. You're using " . PHP_VERSION . ".\n";
-		exit;
-	}
+    // we need a separate check here because functions.php might get parsed
+    // incorrectly before 5.3 because of :: syntax.
+    if (version_compare(PHP_VERSION, '5.6.0', '<')) {
+        print "<b>Fatal Error</b>: PHP version 5.6.0 or newer required. You're using " . PHP_VERSION . ".\n";
+        exit;
+    }
 
-	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
-		get_include_path());
+    set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+        get_include_path());
 
-	require_once "autoload.php";
-	require_once "sessions.php";
-	require_once "functions.php";
-	require_once "sanity_check.php";
-	require_once "config.php";
-	require_once "db-prefs.php";
+    require_once "autoload.php";
+    require_once "sessions.php";
+    require_once "functions.php";
+    require_once "sanity_check.php";
+    require_once "config.php";
+    require_once "db-prefs.php";
 
-	if (!init_plugins()) return;
+    if (!init_plugins()) return;
 
-	login_sequence();
+    login_sequence();
 
-	header('Content-Type: text/html; charset=utf-8');
+    header('Content-Type: text/html; charset=utf-8');
 
 ?>
 <!DOCTYPE html>
@@ -40,23 +40,23 @@ 
     <meta name="viewport" content="initial-scale=1,width=device-width" />
 
 	<?php if ($_SESSION["uid"]) {
-		$theme = get_pref("USER_CSS_THEME", false, false);
-		if ($theme && theme_exists("$theme")) {
-			echo stylesheet_tag(get_theme_path($theme), 'theme_css');
-		}
-	}
+        $theme = get_pref("USER_CSS_THEME", false, false);
+        if ($theme && theme_exists("$theme")) {
+            echo stylesheet_tag(get_theme_path($theme), 'theme_css');
+        }
+    }
 
-	print_user_stylesheet()
+    print_user_stylesheet()
 
-	?>
+    ?>
 	<style type="text/css">
 	<?php
-		foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
-			if (method_exists($p, "get_css")) {
-				echo $p->get_css();
-			}
-		}
-	?>
+        foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
+            if (method_exists($p, "get_css")) {
+                echo $p->get_css();
+            }
+        }
+    ?>
 	</style>
 
 	<link rel="shortcut icon" type="image/png" href="images/favicon.png"/>
@@ -73,17 +73,17 @@ 
 	</script>
 
 	<?php
-	foreach (array("lib/prototype.js",
-				"lib/scriptaculous/scriptaculous.js?load=effects,controls",
-				"lib/dojo/dojo.js",
-				"lib/dojo/tt-rss-layer.js",
-				"js/tt-rss.js",
-				"js/common.js",
-				"errors.php?mode=js") as $jsfile) {
+    foreach (array("lib/prototype.js",
+                "lib/scriptaculous/scriptaculous.js?load=effects,controls",
+                "lib/dojo/dojo.js",
+                "lib/dojo/tt-rss-layer.js",
+                "js/tt-rss.js",
+                "js/common.js",
+                "errors.php?mode=js") as $jsfile) {
 
-		echo javascript_tag($jsfile);
+        echo javascript_tag($jsfile);
 
-	} ?>
+    } ?>
 
 	<script type="text/javascript">
 		require({cache:{}});
@@ -91,22 +91,22 @@ 
 
 	<script type="text/javascript">
 	<?php
-		foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
-			if (method_exists($p, "get_js")) {
-			    $script = $p->get_js();
+        foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
+            if (method_exists($p, "get_js")) {
+                $script = $p->get_js();
 
-			    if ($script) {
-					echo "try {
+                if ($script) {
+                    echo "try {
 					    $script
 					} catch (e) {
                         console.warn('failed to initialize plugin JS: $n', e);
                     }";
-				}
-			}
-		}
+                }
+            }
+        }
 
-		init_js_translations();
-	?>
+        init_js_translations();
+    ?>
 	</script>
 
 	<style type="text/css">
@@ -146,9 +146,9 @@ 
             <img src='images/indicator_tiny.gif'/>
             <?php echo  __("Loading, please wait..."); ?></div>
         <?php
-          foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FEED_TREE) as $p) {
+            foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FEED_TREE) as $p) {
             echo $p->hook_feed_tree();
-          }
+            }
         ?>
         <div id="feedTree"></div>
     </div>
@@ -221,7 +221,7 @@ 
 
                 <?php
                     foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_TOOLBAR_BUTTON) as $p) {
-                         echo $p->hook_toolbar_button();
+                            echo $p->hook_toolbar_button();
                     }
                 ?>
 
@@ -243,7 +243,7 @@ 
 
                         <?php
                             foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ACTION_ITEM) as $p) {
-                             echo $p->hook_action_item();
+                                echo $p->hook_action_item();
                             }
                         ?>
 

prefs.php

Indentation +43 added lines, -43 removed lines

@@ -1,29 +1,29 @@ 
 <?php
-	if (file_exists("install") && !file_exists("config.php")) {
-		header("Location: install/");
-	}
+    if (file_exists("install") && !file_exists("config.php")) {
+        header("Location: install/");
+    }
 
-	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
-		get_include_path());
+    set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+        get_include_path());
 
-	if (!file_exists("config.php")) {
-		print "<b>Fatal Error</b>: You forgot to copy
+    if (!file_exists("config.php")) {
+        print "<b>Fatal Error</b>: You forgot to copy
 		<b>config.php-dist</b> to <b>config.php</b> and edit it.\n";
-		exit;
-	}
+        exit;
+    }
 
-	require_once "autoload.php";
-	require_once "sessions.php";
-	require_once "functions.php";
-	require_once "sanity_check.php";
-	require_once "config.php";
-	require_once "db-prefs.php";
+    require_once "autoload.php";
+    require_once "sessions.php";
+    require_once "functions.php";
+    require_once "sanity_check.php";
+    require_once "config.php";
+    require_once "db-prefs.php";
 
-	if (!init_plugins()) return;
+    if (!init_plugins()) return;
 
-	login_sequence();
+    login_sequence();
 
-	header('Content-Type: text/html; charset=utf-8');
+    header('Content-Type: text/html; charset=utf-8');
 ?>
 <!DOCTYPE html>
 <html>
@@ -32,12 +32,12 @@ 
     <meta name="viewport" content="initial-scale=1,width=device-width" />
 
 	<?php if ($_SESSION["uid"]) {
-		$theme = get_pref("USER_CSS_THEME", false, false);
-		if ($theme && theme_exists("$theme")) {
-			echo stylesheet_tag(get_theme_path($theme), 'theme_css');
-		}
-	}
-	?>
+        $theme = get_pref("USER_CSS_THEME", false, false);
+        if ($theme && theme_exists("$theme")) {
+            echo stylesheet_tag(get_theme_path($theme), 'theme_css');
+        }
+    }
+    ?>
 
 	<?php print_user_stylesheet() ?>
 
@@ -56,17 +56,17 @@ 
 	</script>
 
 	<?php
-	foreach (array("lib/prototype.js",
-				"lib/scriptaculous/scriptaculous.js?load=effects,controls",
-				"lib/dojo/dojo.js",
-				"lib/dojo/tt-rss-layer.js",
-				"js/common.js",
-				"js/prefs.js",
-				"errors.php?mode=js") as $jsfile) {
+    foreach (array("lib/prototype.js",
+                "lib/scriptaculous/scriptaculous.js?load=effects,controls",
+                "lib/dojo/dojo.js",
+                "lib/dojo/tt-rss-layer.js",
+                "js/common.js",
+                "js/prefs.js",
+                "errors.php?mode=js") as $jsfile) {
 
-		echo javascript_tag($jsfile);
+        echo javascript_tag($jsfile);
 
-	} ?>
+    } ?>
 
     <script type="text/javascript">
 		require({cache:{}});
@@ -74,22 +74,22 @@ 
 
 	<script type="text/javascript">
 	<?php
-		foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
-			if (method_exists($p, "get_prefs_js")) {
-				$script = $p->get_prefs_js();
+        foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
+            if (method_exists($p, "get_prefs_js")) {
+                $script = $p->get_prefs_js();
 
-				if ($script) {
-					echo "try {
+                if ($script) {
+                    echo "try {
 					    $script
 					} catch (e) {
                         console.warn('failed to initialize plugin JS: $n', e);
                     }";
-				}
-			}
-		}
+                }
+            }
+        }
 
-		init_js_translations();
-	?>
+        init_js_translations();
+    ?>
 	</script>
 
 	<style type="text/css">

classes/rpc.php

Indentation +387 added lines, -387 removed lines

@@ -1,435 +1,435 @@ 
 <?php
 class RPC extends Handler_Protected {
 
-	public function csrf_ignore($method) {
-		$csrf_ignored = array("sanitycheck", "completelabels", "saveprofile");
+    public function csrf_ignore($method) {
+        $csrf_ignored = array("sanitycheck", "completelabels", "saveprofile");
 
-		return array_search($method, $csrf_ignored) !== false;
-	}
+        return array_search($method, $csrf_ignored) !== false;
+    }
 
-	public function setprofile() {
-		$_SESSION["profile"] = (int) clean($_REQUEST["id"]);
+    public function setprofile() {
+        $_SESSION["profile"] = (int) clean($_REQUEST["id"]);
 
-		// default value
-		if (!$_SESSION["profile"]) $_SESSION["profile"] = null;
-	}
+        // default value
+        if (!$_SESSION["profile"]) $_SESSION["profile"] = null;
+    }
 
-	public function remprofiles() {
-		$ids = explode(",", trim(clean($_REQUEST["ids"])));
+    public function remprofiles() {
+        $ids = explode(",", trim(clean($_REQUEST["ids"])));
 
-		foreach ($ids as $id) {
-			if ($_SESSION["profile"] != $id) {
-				$sth = $this->pdo->prepare("DELETE FROM ttrss_settings_profiles WHERE id = ? AND
+        foreach ($ids as $id) {
+            if ($_SESSION["profile"] != $id) {
+                $sth = $this->pdo->prepare("DELETE FROM ttrss_settings_profiles WHERE id = ? AND
 							owner_uid = ?");
-				$sth->execute([$id, $_SESSION['uid']]);
-			}
-		}
-	}
+                $sth->execute([$id, $_SESSION['uid']]);
+            }
+        }
+    }
 
-	// Silent
-	public function addprofile() {
-		$title = trim(clean($_REQUEST["title"]));
+    // Silent
+    public function addprofile() {
+        $title = trim(clean($_REQUEST["title"]));
 
-		if ($title) {
-			$this->pdo->beginTransaction();
+        if ($title) {
+            $this->pdo->beginTransaction();
 
-			$sth = $this->pdo->prepare("SELECT id FROM ttrss_settings_profiles
+            $sth = $this->pdo->prepare("SELECT id FROM ttrss_settings_profiles
 				WHERE title = ? AND owner_uid = ?");
-			$sth->execute([$title, $_SESSION['uid']]);
+            $sth->execute([$title, $_SESSION['uid']]);
 
-			if (!$sth->fetch()) {
+            if (!$sth->fetch()) {
 
-				$sth = $this->pdo->prepare("INSERT INTO ttrss_settings_profiles (title, owner_uid)
+                $sth = $this->pdo->prepare("INSERT INTO ttrss_settings_profiles (title, owner_uid)
 							VALUES (?, ?)");
 
-				$sth->execute([$title, $_SESSION['uid']]);
+                $sth->execute([$title, $_SESSION['uid']]);
 
-				$sth = $this->pdo->prepare("SELECT id FROM ttrss_settings_profiles WHERE
+                $sth = $this->pdo->prepare("SELECT id FROM ttrss_settings_profiles WHERE
 					title = ? AND owner_uid = ?");
-				$sth->execute([$title, $_SESSION['uid']]);
+                $sth->execute([$title, $_SESSION['uid']]);
 
-				if ($row = $sth->fetch()) {
-					$profile_id = $row['id'];
+                if ($row = $sth->fetch()) {
+                    $profile_id = $row['id'];
 
-					if ($profile_id) {
-						initialize_user_prefs($_SESSION["uid"], $profile_id);
-					}
-				}
-			}
+                    if ($profile_id) {
+                        initialize_user_prefs($_SESSION["uid"], $profile_id);
+                    }
+                }
+            }
 
-			$this->pdo->commit();
-		}
-	}
+            $this->pdo->commit();
+        }
+    }
 
-	public function saveprofile() {
-		$id = clean($_REQUEST["id"]);
-		$title = trim(clean($_REQUEST["value"]));
+    public function saveprofile() {
+        $id = clean($_REQUEST["id"]);
+        $title = trim(clean($_REQUEST["value"]));
 
-		if ($id == 0) {
-			print __("Default profile");
-			return;
-		}
+        if ($id == 0) {
+            print __("Default profile");
+            return;
+        }
 
-		if ($title) {
-			$sth = $this->pdo->prepare("UPDATE ttrss_settings_profiles
+        if ($title) {
+            $sth = $this->pdo->prepare("UPDATE ttrss_settings_profiles
 				SET title = ? WHERE id = ? AND
 					owner_uid = ?");
 
-			$sth->execute([$title, $id, $_SESSION['uid']]);
-			print $title;
-		}
-	}
+            $sth->execute([$title, $id, $_SESSION['uid']]);
+            print $title;
+        }
+    }
 
-	// Silent
-	public function remarchive() {
-		$ids = explode(",", clean($_REQUEST["ids"]));
+    // Silent
+    public function remarchive() {
+        $ids = explode(",", clean($_REQUEST["ids"]));
 
-		$sth = $this->pdo->prepare("DELETE FROM ttrss_archived_feeds WHERE
+        $sth = $this->pdo->prepare("DELETE FROM ttrss_archived_feeds WHERE
 		  		(SELECT COUNT(*) FROM ttrss_user_entries
 					WHERE orig_feed_id = :id) = 0 AND
 						id = :id AND owner_uid = :uid");
 
-		foreach ($ids as $id) {
-			$sth->execute([":id" => $id, ":uid" => $_SESSION['uid']]);
-		}
-	}
+        foreach ($ids as $id) {
+            $sth->execute([":id" => $id, ":uid" => $_SESSION['uid']]);
+        }
+    }
 
-	public function addfeed() {
-		$feed = clean($_REQUEST['feed']);
-		$cat = clean($_REQUEST['cat']);
-		$need_auth = isset($_REQUEST['need_auth']);
-		$login = $need_auth ? clean($_REQUEST['login']) : '';
-		$pass = $need_auth ? trim(clean($_REQUEST['pass'])) : '';
+    public function addfeed() {
+        $feed = clean($_REQUEST['feed']);
+        $cat = clean($_REQUEST['cat']);
+        $need_auth = isset($_REQUEST['need_auth']);
+        $login = $need_auth ? clean($_REQUEST['login']) : '';
+        $pass = $need_auth ? trim(clean($_REQUEST['pass'])) : '';
 
-		$rc = Feeds::subscribe_to_feed($feed, $cat, $login, $pass);
+        $rc = Feeds::subscribe_to_feed($feed, $cat, $login, $pass);
 
-		print json_encode(array("result" => $rc));
-	}
+        print json_encode(array("result" => $rc));
+    }
 
-	public function togglepref() {
-		$key = clean($_REQUEST["key"]);
-		set_pref($key, !get_pref($key));
-		$value = get_pref($key);
+    public function togglepref() {
+        $key = clean($_REQUEST["key"]);
+        set_pref($key, !get_pref($key));
+        $value = get_pref($key);
 
-		print json_encode(array("param" =>$key, "value" => $value));
-	}
+        print json_encode(array("param" =>$key, "value" => $value));
+    }
 
-	public function setpref() {
-		// set_pref escapes input, so no need to double escape it here
-		$key = clean($_REQUEST['key']);
-		$value = $_REQUEST['value'];
+    public function setpref() {
+        // set_pref escapes input, so no need to double escape it here
+        $key = clean($_REQUEST['key']);
+        $value = $_REQUEST['value'];
 
-		set_pref($key, $value, false, $key != 'USER_STYLESHEET');
+        set_pref($key, $value, false, $key != 'USER_STYLESHEET');
 
-		print json_encode(array("param" =>$key, "value" => $value));
-	}
+        print json_encode(array("param" =>$key, "value" => $value));
+    }
 
-	public function mark() {
-		$mark = clean($_REQUEST["mark"]);
-		$id = clean($_REQUEST["id"]);
+    public function mark() {
+        $mark = clean($_REQUEST["mark"]);
+        $id = clean($_REQUEST["id"]);
 
-		$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET marked = ?,
+        $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET marked = ?,
 					last_marked = NOW()
 					WHERE ref_id = ? AND owner_uid = ?");
 
-		$sth->execute([$mark, $id, $_SESSION['uid']]);
+        $sth->execute([$mark, $id, $_SESSION['uid']]);
 
-		print json_encode(array("message" => "UPDATE_COUNTERS"));
-	}
+        print json_encode(array("message" => "UPDATE_COUNTERS"));
+    }
 
-	public function delete() {
-		$ids = explode(",", clean($_REQUEST["ids"]));
-		$ids_qmarks = arr_qmarks($ids);
+    public function delete() {
+        $ids = explode(",", clean($_REQUEST["ids"]));
+        $ids_qmarks = arr_qmarks($ids);
 
-		$sth = $this->pdo->prepare("DELETE FROM ttrss_user_entries
+        $sth = $this->pdo->prepare("DELETE FROM ttrss_user_entries
 			WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
-		$sth->execute(array_merge($ids, [$_SESSION['uid']]));
+        $sth->execute(array_merge($ids, [$_SESSION['uid']]));
 
-		Article::purge_orphans();
+        Article::purge_orphans();
 
-		print json_encode(array("message" => "UPDATE_COUNTERS"));
-	}
+        print json_encode(array("message" => "UPDATE_COUNTERS"));
+    }
 
-	public function unarchive() {
-		$ids = explode(",", clean($_REQUEST["ids"]));
+    public function unarchive() {
+        $ids = explode(",", clean($_REQUEST["ids"]));
 
-		foreach ($ids as $id) {
-			$this->pdo->beginTransaction();
+        foreach ($ids as $id) {
+            $this->pdo->beginTransaction();
 
-			$sth = $this->pdo->prepare("SELECT feed_url,site_url,title FROM ttrss_archived_feeds
+            $sth = $this->pdo->prepare("SELECT feed_url,site_url,title FROM ttrss_archived_feeds
 				WHERE id = (SELECT orig_feed_id FROM ttrss_user_entries WHERE ref_id = :id
 				AND owner_uid = :uid) AND owner_uid = :uid");
-			$sth->execute([":uid" => $_SESSION['uid'], ":id" => $id]);
+            $sth->execute([":uid" => $_SESSION['uid'], ":id" => $id]);
 
-			if ($row = $sth->fetch()) {
-				$feed_url = $row['feed_url'];
-				$site_url = $row['site_url'];
-				$title = $row['title'];
+            if ($row = $sth->fetch()) {
+                $feed_url = $row['feed_url'];
+                $site_url = $row['site_url'];
+                $title = $row['title'];
 
-				$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE feed_url = ?
+                $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE feed_url = ?
 					AND owner_uid = ?");
-				$sth->execute([$feed_url, $_SESSION['uid']]);
+                $sth->execute([$feed_url, $_SESSION['uid']]);
 
-				if ($row = $sth->fetch()) {
-					$feed_id = $row["id"];
-				} else {
-					if (!$title) $title = '[Unknown]';
+                if ($row = $sth->fetch()) {
+                    $feed_id = $row["id"];
+                } else {
+                    if (!$title) $title = '[Unknown]';
 
-					$sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
+                    $sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
 							(owner_uid,feed_url,site_url,title,cat_id,auth_login,auth_pass,update_method)
 							VALUES (?, ?, ?, ?, NULL, '', '', 0)");
-					$sth->execute([$_SESSION['uid'], $feed_url, $site_url, $title]);
+                    $sth->execute([$_SESSION['uid'], $feed_url, $site_url, $title]);
 
-					$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE feed_url = ?
+                    $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE feed_url = ?
 						AND owner_uid = ?");
-					$sth->execute([$feed_url, $_SESSION['uid']]);
+                    $sth->execute([$feed_url, $_SESSION['uid']]);
 
-					if ($row = $sth->fetch()) {
-						$feed_id = $row['id'];
-					}
-				}
+                    if ($row = $sth->fetch()) {
+                        $feed_id = $row['id'];
+                    }
+                }
 
-				if ($feed_id) {
-					$sth = $this->pdo->prepare("UPDATE ttrss_user_entries
+                if ($feed_id) {
+                    $sth = $this->pdo->prepare("UPDATE ttrss_user_entries
 						SET feed_id = ?, orig_feed_id = NULL
 						WHERE ref_id = ? AND owner_uid = ?");
-					$sth->execute([$feed_id, $id, $_SESSION['uid']]);
-				}
-			}
+                    $sth->execute([$feed_id, $id, $_SESSION['uid']]);
+                }
+            }
 
-			$this->pdo->commit();
-		}
+            $this->pdo->commit();
+        }
 
-		print json_encode(array("message" => "UPDATE_COUNTERS"));
-	}
+        print json_encode(array("message" => "UPDATE_COUNTERS"));
+    }
 
-	public function archive() {
-		$ids = explode(",", clean($_REQUEST["ids"]));
+    public function archive() {
+        $ids = explode(",", clean($_REQUEST["ids"]));
 
-		foreach ($ids as $id) {
-			$this->archive_article($id, $_SESSION["uid"]);
-		}
+        foreach ($ids as $id) {
+            $this->archive_article($id, $_SESSION["uid"]);
+        }
 
-		print json_encode(array("message" => "UPDATE_COUNTERS"));
-	}
+        print json_encode(array("message" => "UPDATE_COUNTERS"));
+    }
 
-	private function archive_article($id, $owner_uid) {
-		$this->pdo->beginTransaction();
+    private function archive_article($id, $owner_uid) {
+        $this->pdo->beginTransaction();
 
-		if (!$owner_uid) $owner_uid = $_SESSION['uid'];
+        if (!$owner_uid) $owner_uid = $_SESSION['uid'];
 
-		$sth = $this->pdo->prepare("SELECT feed_id FROM ttrss_user_entries
+        $sth = $this->pdo->prepare("SELECT feed_id FROM ttrss_user_entries
 			WHERE ref_id = ? AND owner_uid = ?");
-		$sth->execute([$id, $owner_uid]);
+        $sth->execute([$id, $owner_uid]);
 
-		if ($row = $sth->fetch()) {
+        if ($row = $sth->fetch()) {
 
-			/* prepare the archived table */
+            /* prepare the archived table */
 
-			$feed_id = (int) $row['feed_id'];
+            $feed_id = (int) $row['feed_id'];
 
-			if ($feed_id) {
-				$sth = $this->pdo->prepare("SELECT id FROM ttrss_archived_feeds
+            if ($feed_id) {
+                $sth = $this->pdo->prepare("SELECT id FROM ttrss_archived_feeds
 					WHERE id = ? AND owner_uid = ?");
-				$sth->execute([$feed_id, $owner_uid]);
+                $sth->execute([$feed_id, $owner_uid]);
 
-				if ($row = $sth->fetch()) {
-					$new_feed_id = $row['id'];
-				} else {
-					$row = $this->pdo->query("SELECT MAX(id) AS id FROM ttrss_archived_feeds")->fetch();
-					$new_feed_id = (int)$row['id'] + 1;
+                if ($row = $sth->fetch()) {
+                    $new_feed_id = $row['id'];
+                } else {
+                    $row = $this->pdo->query("SELECT MAX(id) AS id FROM ttrss_archived_feeds")->fetch();
+                    $new_feed_id = (int)$row['id'] + 1;
 
-					$sth = $this->pdo->prepare("INSERT INTO ttrss_archived_feeds
+                    $sth = $this->pdo->prepare("INSERT INTO ttrss_archived_feeds
 						(id, owner_uid, title, feed_url, site_url, created)
 							SELECT ?, owner_uid, title, feed_url, site_url, NOW() from ttrss_feeds
 							  	WHERE id = ?");
 
-					$sth->execute([$new_feed_id, $feed_id]);
-				}
+                    $sth->execute([$new_feed_id, $feed_id]);
+                }
 
-				$sth = $this->pdo->prepare("UPDATE ttrss_user_entries
+                $sth = $this->pdo->prepare("UPDATE ttrss_user_entries
 					SET orig_feed_id = ?, feed_id = NULL
 					WHERE ref_id = ? AND owner_uid = ?");
-				$sth->execute([$new_feed_id, $id, $owner_uid]);
-			}
-		}
+                $sth->execute([$new_feed_id, $id, $owner_uid]);
+            }
+        }
 
-		$this->pdo->commit();
-	}
+        $this->pdo->commit();
+    }
 
-	public function publ() {
-		$pub = clean($_REQUEST["pub"]);
-		$id = clean($_REQUEST["id"]);
+    public function publ() {
+        $pub = clean($_REQUEST["pub"]);
+        $id = clean($_REQUEST["id"]);
 
-		$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
+        $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
 			published = ?, last_published = NOW()
 			WHERE ref_id = ? AND owner_uid = ?");
 
-		$sth->execute([$pub, $id, $_SESSION['uid']]);
+        $sth->execute([$pub, $id, $_SESSION['uid']]);
 
-		print json_encode(array("message" => "UPDATE_COUNTERS"));
-	}
+        print json_encode(array("message" => "UPDATE_COUNTERS"));
+    }
 
-	public function getAllCounters() {
-		@$seq = (int) $_REQUEST['seq'];
+    public function getAllCounters() {
+        @$seq = (int) $_REQUEST['seq'];
 
-		$reply = [
-			'counters' => Counters::getAllCounters(),
-			'seq' => $seq
-		];
+        $reply = [
+            'counters' => Counters::getAllCounters(),
+            'seq' => $seq
+        ];
 
-		if ($seq % 2 == 0)
-			$reply['runtime-info'] = make_runtime_info();
+        if ($seq % 2 == 0)
+            $reply['runtime-info'] = make_runtime_info();
 
-		print json_encode($reply);
-	}
+        print json_encode($reply);
+    }
 
-	/* GET["cmode"] = 0 - mark as read, 1 - as unread, 2 - toggle */
-	public function catchupSelected() {
-		$ids = explode(",", clean($_REQUEST["ids"]));
-		$cmode = (int)clean($_REQUEST["cmode"]);
+    /* GET["cmode"] = 0 - mark as read, 1 - as unread, 2 - toggle */
+    public function catchupSelected() {
+        $ids = explode(",", clean($_REQUEST["ids"]));
+        $cmode = (int)clean($_REQUEST["cmode"]);
 
-		Article::catchupArticlesById($ids, $cmode);
+        Article::catchupArticlesById($ids, $cmode);
 
-		print json_encode(array("message" => "UPDATE_COUNTERS", "ids" => $ids));
-	}
+        print json_encode(array("message" => "UPDATE_COUNTERS", "ids" => $ids));
+    }
 
-	public function markSelected() {
-		$ids = explode(",", clean($_REQUEST["ids"]));
-		$cmode = (int)clean($_REQUEST["cmode"]);
+    public function markSelected() {
+        $ids = explode(",", clean($_REQUEST["ids"]));
+        $cmode = (int)clean($_REQUEST["cmode"]);
 
-		$this->markArticlesById($ids, $cmode);
+        $this->markArticlesById($ids, $cmode);
 
-		print json_encode(array("message" => "UPDATE_COUNTERS"));
-	}
+        print json_encode(array("message" => "UPDATE_COUNTERS"));
+    }
 
-	public function publishSelected() {
-		$ids = explode(",", clean($_REQUEST["ids"]));
-		$cmode = (int)clean($_REQUEST["cmode"]);
+    public function publishSelected() {
+        $ids = explode(",", clean($_REQUEST["ids"]));
+        $cmode = (int)clean($_REQUEST["cmode"]);
 
-		$this->publishArticlesById($ids, $cmode);
+        $this->publishArticlesById($ids, $cmode);
 
-		print json_encode(array("message" => "UPDATE_COUNTERS"));
-	}
+        print json_encode(array("message" => "UPDATE_COUNTERS"));
+    }
 
-	public function sanityCheck() {
-		$_SESSION["hasAudio"] = clean($_REQUEST["hasAudio"]) === "true";
-		$_SESSION["hasSandbox"] = clean($_REQUEST["hasSandbox"]) === "true";
-		$_SESSION["hasMp3"] = clean($_REQUEST["hasMp3"]) === "true";
-		$_SESSION["clientTzOffset"] = clean($_REQUEST["clientTzOffset"]);
+    public function sanityCheck() {
+        $_SESSION["hasAudio"] = clean($_REQUEST["hasAudio"]) === "true";
+        $_SESSION["hasSandbox"] = clean($_REQUEST["hasSandbox"]) === "true";
+        $_SESSION["hasMp3"] = clean($_REQUEST["hasMp3"]) === "true";
+        $_SESSION["clientTzOffset"] = clean($_REQUEST["clientTzOffset"]);
 
-		$reply = array();
+        $reply = array();
 
-		$reply['error'] = sanity_check();
+        $reply['error'] = sanity_check();
 
-		if ($reply['error']['code'] == 0) {
-			$reply['init-params'] = make_init_params();
-			$reply['runtime-info'] = make_runtime_info();
-		}
+        if ($reply['error']['code'] == 0) {
+            $reply['init-params'] = make_init_params();
+            $reply['runtime-info'] = make_runtime_info();
+        }
 
-		print json_encode($reply);
-	}
+        print json_encode($reply);
+    }
 
-	public function completeLabels() {
-		$search = clean($_REQUEST["search"]);
+    public function completeLabels() {
+        $search = clean($_REQUEST["search"]);
 
-		$sth = $this->pdo->prepare("SELECT DISTINCT caption FROM
+        $sth = $this->pdo->prepare("SELECT DISTINCT caption FROM
 				ttrss_labels2
 				WHERE owner_uid = ? AND
 				LOWER(caption) LIKE LOWER(?) ORDER BY caption
 				LIMIT 5");
-		$sth->execute([$_SESSION['uid'], "%$search%"]);
+        $sth->execute([$_SESSION['uid'], "%$search%"]);
 
-		print "<ul>";
-		while ($line = $sth->fetch()) {
-			print "<li>" . $line["caption"] . "</li>";
-		}
-		print "</ul>";
-	}
+        print "<ul>";
+        while ($line = $sth->fetch()) {
+            print "<li>" . $line["caption"] . "</li>";
+        }
+        print "</ul>";
+    }
 
-	// Silent
-	public function massSubscribe() {
+    // Silent
+    public function massSubscribe() {
 
-		$payload = json_decode(clean($_REQUEST["payload"]), false);
-		$mode = clean($_REQUEST["mode"]);
+        $payload = json_decode(clean($_REQUEST["payload"]), false);
+        $mode = clean($_REQUEST["mode"]);
 
-		if (!$payload || !is_array($payload)) return;
+        if (!$payload || !is_array($payload)) return;
 
-		if ($mode == 1) {
-			foreach ($payload as $feed) {
+        if ($mode == 1) {
+            foreach ($payload as $feed) {
 
-				$title = $feed[0];
-				$feed_url = $feed[1];
+                $title = $feed[0];
+                $feed_url = $feed[1];
 
-				$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
+                $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
 					feed_url = ? AND owner_uid = ?");
-				$sth->execute([$feed_url, $_SESSION['uid']]);
+                $sth->execute([$feed_url, $_SESSION['uid']]);
 
-				if (!$sth->fetch()) {
-					$sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
+                if (!$sth->fetch()) {
+                    $sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
 									(owner_uid,feed_url,title,cat_id,site_url)
 									VALUES (?, ?, ?, NULL, '')");
 
-					$sth->execute([$_SESSION['uid'], $feed_url, $title]);
-				}
-			}
-		} else if ($mode == 2) {
-			// feed archive
-			foreach ($payload as $id) {
-				$sth = $this->pdo->prepare("SELECT * FROM ttrss_archived_feeds
+                    $sth->execute([$_SESSION['uid'], $feed_url, $title]);
+                }
+            }
+        } else if ($mode == 2) {
+            // feed archive
+            foreach ($payload as $id) {
+                $sth = $this->pdo->prepare("SELECT * FROM ttrss_archived_feeds
 					WHERE id = ? AND owner_uid = ?");
-				$sth->execute([$id, $_SESSION['uid']]);
+                $sth->execute([$id, $_SESSION['uid']]);
 
-				if ($row = $sth->fetch()) {
-					$site_url = $row['site_url'];
-					$feed_url = $row['feed_url'];
-					$title = $row['title'];
+                if ($row = $sth->fetch()) {
+                    $site_url = $row['site_url'];
+                    $feed_url = $row['feed_url'];
+                    $title = $row['title'];
 
-					$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
+                    $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
 						feed_url = ? AND owner_uid = ?");
-					$sth->execute([$feed_url, $_SESSION['uid']]);
+                    $sth->execute([$feed_url, $_SESSION['uid']]);
 
-					if (!$sth->fetch()) {
-						$sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
+                    if (!$sth->fetch()) {
+                        $sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
 								(owner_uid,feed_url,title,cat_id,site_url)
 									VALUES (?, ?, ?, NULL, ?)");
 
-						$sth->execute([$_SESSION['uid'], $feed_url, $title, $site_url]);
-					}
-				}
-			}
-		}
-	}
+                        $sth->execute([$_SESSION['uid'], $feed_url, $title, $site_url]);
+                    }
+                }
+            }
+        }
+    }
 
-	public function catchupFeed() {
-		$feed_id = clean($_REQUEST['feed_id']);
-		$is_cat = clean($_REQUEST['is_cat']) == "true";
-		$mode = clean($_REQUEST['mode']);
-		$search_query = clean($_REQUEST['search_query']);
-		$search_lang = clean($_REQUEST['search_lang']);
+    public function catchupFeed() {
+        $feed_id = clean($_REQUEST['feed_id']);
+        $is_cat = clean($_REQUEST['is_cat']) == "true";
+        $mode = clean($_REQUEST['mode']);
+        $search_query = clean($_REQUEST['search_query']);
+        $search_lang = clean($_REQUEST['search_lang']);
 
-		Feeds::catchup_feed($feed_id, $is_cat, false, $mode, [$search_query, $search_lang]);
+        Feeds::catchup_feed($feed_id, $is_cat, false, $mode, [$search_query, $search_lang]);
 
-		// return counters here synchronously so that frontend can figure out next unread feed properly
-		print json_encode(['counters' => Counters::getAllCounters()]);
+        // return counters here synchronously so that frontend can figure out next unread feed properly
+        print json_encode(['counters' => Counters::getAllCounters()]);
 
-		//print json_encode(array("message" => "UPDATE_COUNTERS"));
-	}
+        //print json_encode(array("message" => "UPDATE_COUNTERS"));
+    }
 
-	public function setpanelmode() {
-		$wide = (int) clean($_REQUEST["wide"]);
+    public function setpanelmode() {
+        $wide = (int) clean($_REQUEST["wide"]);
 
-		setcookie("ttrss_widescreen", $wide,
-			time() + COOKIE_LIFETIME_LONG);
+        setcookie("ttrss_widescreen", $wide,
+            time() + COOKIE_LIFETIME_LONG);
 
-		print json_encode(array("wide" => $wide));
-	}
+        print json_encode(array("wide" => $wide));
+    }
 
-	public static function updaterandomfeed_real() {
+    public static function updaterandomfeed_real() {
 
-		// Test if the feed need a update (update interval exceded).
-		if (DB_TYPE == "pgsql") {
-			$update_limit_qpart = "AND ((
+        // Test if the feed need a update (update interval exceded).
+        if (DB_TYPE == "pgsql") {
+            $update_limit_qpart = "AND ((
 					ttrss_feeds.update_interval = 0
 					AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_user_prefs.value || ' minutes') AS INTERVAL)
 				) OR (
@@ -437,8 +437,8 @@ 
 					AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_feeds.update_interval || ' minutes') AS INTERVAL)
 				) OR ttrss_feeds.last_updated IS NULL
 				OR last_updated = '1970-01-01 00:00:00')";
-		} else {
-			$update_limit_qpart = "AND ((
+        } else {
+            $update_limit_qpart = "AND ((
 					ttrss_feeds.update_interval = 0
 					AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL CONVERT(ttrss_user_prefs.value, SIGNED INTEGER) MINUTE)
 				) OR (
@@ -446,28 +446,28 @@ 
 					AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL ttrss_feeds.update_interval MINUTE)
 				) OR ttrss_feeds.last_updated IS NULL
 				OR last_updated = '1970-01-01 00:00:00')";
-		}
+        }
 
-		// Test if feed is currently being updated by another process.
-		if (DB_TYPE == "pgsql") {
-			$updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < NOW() - INTERVAL '5 minutes')";
-		} else {
-			$updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 5 MINUTE))";
-		}
+        // Test if feed is currently being updated by another process.
+        if (DB_TYPE == "pgsql") {
+            $updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < NOW() - INTERVAL '5 minutes')";
+        } else {
+            $updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 5 MINUTE))";
+        }
 
-		$random_qpart = sql_random_function();
+        $random_qpart = sql_random_function();
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		// we could be invoked from public.php with no active session
-		if ($_SESSION["uid"]) {
-			$owner_check_qpart = "AND ttrss_feeds.owner_uid = ".$pdo->quote($_SESSION["uid"]);
-		} else {
-			$owner_check_qpart = "";
-		}
+        // we could be invoked from public.php with no active session
+        if ($_SESSION["uid"]) {
+            $owner_check_qpart = "AND ttrss_feeds.owner_uid = ".$pdo->quote($_SESSION["uid"]);
+        } else {
+            $owner_check_qpart = "";
+        }
 
-		// We search for feed needing update.
-		$res = $pdo->query("SELECT ttrss_feeds.feed_url,ttrss_feeds.id
+        // We search for feed needing update.
+        $res = $pdo->query("SELECT ttrss_feeds.feed_url,ttrss_feeds.id
 			FROM
 				ttrss_feeds, ttrss_users, ttrss_user_prefs
 			WHERE
@@ -479,139 +479,139 @@ 
 				$updstart_thresh_qpart
 			ORDER BY $random_qpart LIMIT 30");
 
-		$num_updated = 0;
+        $num_updated = 0;
 
-		$tstart = time();
+        $tstart = time();
 
-		while ($line = $res->fetch()) {
-			$feed_id = $line["id"];
+        while ($line = $res->fetch()) {
+            $feed_id = $line["id"];
 
-			if (time() - $tstart < ini_get("max_execution_time") * 0.7) {
-				RSSUtils::update_rss_feed($feed_id, true);
-				++$num_updated;
-			} else {
-				break;
-			}
-		}
+            if (time() - $tstart < ini_get("max_execution_time") * 0.7) {
+                RSSUtils::update_rss_feed($feed_id, true);
+                ++$num_updated;
+            } else {
+                break;
+            }
+        }
 
-		// Purge orphans and cleanup tags
-		Article::purge_orphans();
-		//cleanup_tags(14, 50000);
+        // Purge orphans and cleanup tags
+        Article::purge_orphans();
+        //cleanup_tags(14, 50000);
 
-		if ($num_updated > 0) {
-			print json_encode(array("message" => "UPDATE_COUNTERS",
-				"num_updated" => $num_updated));
-		} else {
-			print json_encode(array("message" => "NOTHING_TO_UPDATE"));
-		}
+        if ($num_updated > 0) {
+            print json_encode(array("message" => "UPDATE_COUNTERS",
+                "num_updated" => $num_updated));
+        } else {
+            print json_encode(array("message" => "NOTHING_TO_UPDATE"));
+        }
 
-	}
+    }
 
-	public function updaterandomfeed() {
-		RPC::updaterandomfeed_real();
-	}
+    public function updaterandomfeed() {
+        RPC::updaterandomfeed_real();
+    }
 
-	private function markArticlesById($ids, $cmode) {
+    private function markArticlesById($ids, $cmode) {
 
-		$ids_qmarks = arr_qmarks($ids);
+        $ids_qmarks = arr_qmarks($ids);
 
-		if ($cmode == 0) {
-			$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
+        if ($cmode == 0) {
+            $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
 				marked = false, last_marked = NOW()
 					WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
-		} else if ($cmode == 1) {
-			$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
+        } else if ($cmode == 1) {
+            $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
 				marked = true, last_marked = NOW()
 					WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
-		} else {
-			$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
+        } else {
+            $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
 				marked = NOT marked,last_marked = NOW()
 					WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
-		}
+        }
 
-		$sth->execute(array_merge($ids, [$_SESSION['uid']]));
-	}
+        $sth->execute(array_merge($ids, [$_SESSION['uid']]));
+    }
 
-	private function publishArticlesById($ids, $cmode) {
+    private function publishArticlesById($ids, $cmode) {
 
-		$ids_qmarks = arr_qmarks($ids);
+        $ids_qmarks = arr_qmarks($ids);
 
-		if ($cmode == 0) {
-			$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
+        if ($cmode == 0) {
+            $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
 				published = false, last_published = NOW()
 					WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
-		} else if ($cmode == 1) {
-			$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
+        } else if ($cmode == 1) {
+            $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
 				published = true, last_published = NOW()
 					WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
-		} else {
-			$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
+        } else {
+            $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
 				published = NOT published,last_published = NOW()
 					WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
-		}
+        }
 
-		$sth->execute(array_merge($ids, [$_SESSION['uid']]));
-	}
+        $sth->execute(array_merge($ids, [$_SESSION['uid']]));
+    }
 
-	public function getlinktitlebyid() {
-		$id = clean($_REQUEST['id']);
+    public function getlinktitlebyid() {
+        $id = clean($_REQUEST['id']);
 
-		$sth = $this->pdo->prepare("SELECT link, title FROM ttrss_entries, ttrss_user_entries
+        $sth = $this->pdo->prepare("SELECT link, title FROM ttrss_entries, ttrss_user_entries
 			WHERE ref_id = ? AND ref_id = id AND owner_uid = ?");
-		$sth->execute([$id, $_SESSION['uid']]);
+        $sth->execute([$id, $_SESSION['uid']]);
 
-		if ($row = $sth->fetch()) {
-			$link = $row['link'];
-			$title = $row['title'];
+        if ($row = $sth->fetch()) {
+            $link = $row['link'];
+            $title = $row['title'];
 
-			echo json_encode(array("link" => $link, "title" => $title));
-		} else {
-			echo json_encode(array("error" => "ARTICLE_NOT_FOUND"));
-		}
-	}
+            echo json_encode(array("link" => $link, "title" => $title));
+        } else {
+            echo json_encode(array("error" => "ARTICLE_NOT_FOUND"));
+        }
+    }
 
-	public function log() {
-		$msg = clean($_REQUEST['msg']);
-		$file = clean_filename($_REQUEST['file']);
-		$line = (int) clean($_REQUEST['line']);
-		$context = clean($_REQUEST['context']);
+    public function log() {
+        $msg = clean($_REQUEST['msg']);
+        $file = clean_filename($_REQUEST['file']);
+        $line = (int) clean($_REQUEST['line']);
+        $context = clean($_REQUEST['context']);
 
-		if ($msg) {
-			Logger::get()->log_error(E_USER_WARNING,
-				$msg, 'client-js:' . $file, $line, $context);
+        if ($msg) {
+            Logger::get()->log_error(E_USER_WARNING,
+                $msg, 'client-js:' . $file, $line, $context);
 
-			echo json_encode(array("message" => "HOST_ERROR_LOGGED"));
-		} else {
-			echo json_encode(array("error" => "MESSAGE_NOT_FOUND"));
-		}
+            echo json_encode(array("message" => "HOST_ERROR_LOGGED"));
+        } else {
+            echo json_encode(array("error" => "MESSAGE_NOT_FOUND"));
+        }
 
-	}
+    }
 
-	public function checkforupdates() {
-		$rv = [];
+    public function checkforupdates() {
+        $rv = [];
 
-		$git_timestamp = false;
-		$git_commit = false;
+        $git_timestamp = false;
+        $git_commit = false;
 
-		get_version($git_commit, $git_timestamp);
+        get_version($git_commit, $git_timestamp);
 
-		if (CHECK_FOR_UPDATES && $_SESSION["access_level"] >= 10 && $git_timestamp) {
-			$content = @fetch_file_contents(["url" => "https://srv.tt-rss.org/version.json"]);
+        if (CHECK_FOR_UPDATES && $_SESSION["access_level"] >= 10 && $git_timestamp) {
+            $content = @fetch_file_contents(["url" => "https://srv.tt-rss.org/version.json"]);
 
-			if ($content) {
-				$content = json_decode($content, true);
+            if ($content) {
+                $content = json_decode($content, true);
 
-				if ($content && isset($content["changeset"])) {
-					if ($git_timestamp < (int)$content["changeset"]["timestamp"] &&
-						$git_commit != $content["changeset"]["id"]) {
+                if ($content && isset($content["changeset"])) {
+                    if ($git_timestamp < (int)$content["changeset"]["timestamp"] &&
+                        $git_commit != $content["changeset"]["id"]) {
 
-						$rv = $content["changeset"];
-					}
-				}
-			}
-		}
+                        $rv = $content["changeset"];
+                    }
+                }
+            }
+        }
 
-		print json_encode($rv);
-	}
+        print json_encode($rv);
+    }
 
 }

classes/mailer.php

Indentation +35 added lines, -35 removed lines

@@ -1,52 +1,52 @@
 <?php
 class Mailer {
-	// TODO: support HTML mail (i.e. MIME messages)
+    // TODO: support HTML mail (i.e. MIME messages)
 
-	private $last_error = "Unable to send mail: check local configuration.";
+    private $last_error = "Unable to send mail: check local configuration.";
 
-	public function mail($params) {
+    public function mail($params) {
 
-		$to_name = $params["to_name"];
-		$to_address = $params["to_address"];
-		$subject = $params["subject"];
-		$message = $params["message"];
-		$from_name = $params["from_name"] ? $params["from_name"] : SMTP_FROM_NAME;
-		$from_address = $params["from_address"] ? $params["from_address"] : SMTP_FROM_ADDRESS;
+        $to_name = $params["to_name"];
+        $to_address = $params["to_address"];
+        $subject = $params["subject"];
+        $message = $params["message"];
+        $from_name = $params["from_name"] ? $params["from_name"] : SMTP_FROM_NAME;
+        $from_address = $params["from_address"] ? $params["from_address"] : SMTP_FROM_ADDRESS;
 
-		$additional_headers = $params["headers"] ? $params["headers"] : [];
+        $additional_headers = $params["headers"] ? $params["headers"] : [];
 
-		$from_combined = $from_name ? "$from_name <$from_address>" : $from_address;
-		$to_combined = $to_name ? "$to_name <$to_address>" : $to_address;
+        $from_combined = $from_name ? "$from_name <$from_address>" : $from_address;
+        $to_combined = $to_name ? "$to_name <$to_address>" : $to_address;
 
-		if (defined('_LOG_SENT_MAIL') && _LOG_SENT_MAIL)
-			Logger::get()->log("Sending mail from $from_combined to $to_combined [$subject]: $message");
+        if (defined('_LOG_SENT_MAIL') && _LOG_SENT_MAIL)
+            Logger::get()->log("Sending mail from $from_combined to $to_combined [$subject]: $message");
 
-		// HOOK_SEND_MAIL plugin instructions:
-		// 1. return 1 or true if mail is handled
-		// 2. return -1 if there's been a fatal error and no further action is allowed
-		// 3. any other return value will allow cycling to the next handler and, eventually, to default mail() function
-		// 4. set error message if needed via passed Mailer instance function set_error()
+        // HOOK_SEND_MAIL plugin instructions:
+        // 1. return 1 or true if mail is handled
+        // 2. return -1 if there's been a fatal error and no further action is allowed
+        // 3. any other return value will allow cycling to the next handler and, eventually, to default mail() function
+        // 4. set error message if needed via passed Mailer instance function set_error()
 
-		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SEND_MAIL) as $p) {
-			$rc = $p->hook_send_mail($this, $params);
+        foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SEND_MAIL) as $p) {
+            $rc = $p->hook_send_mail($this, $params);
 
-			if ($rc == 1)
-				return $rc;
+            if ($rc == 1)
+                return $rc;
 
-			if ($rc == -1)
-				return 0;
-		}
+            if ($rc == -1)
+                return 0;
+        }
 
-		$headers = [ "From: $from_combined", "Content-Type: text/plain; charset=UTF-8" ];
+        $headers = [ "From: $from_combined", "Content-Type: text/plain; charset=UTF-8" ];
 
-		return mail($to_combined, $subject, $message, implode("\r\n", array_merge($headers, $additional_headers)));
-	}
+        return mail($to_combined, $subject, $message, implode("\r\n", array_merge($headers, $additional_headers)));
+    }
 
-	public function set_error($message) {
-		$this->last_error = $message;
-	}
+    public function set_error($message) {
+        $this->last_error = $message;
+    }
 
-	public function error() {
-		return $this->last_error;
-	}
+    public function error() {
+        return $this->last_error;
+    }
 }

classes/feeditem.php

Indentation +12 added lines, -12 removed lines

@@ -1,16 +1,16 @@
 <?php
 abstract class FeedItem {
-	abstract function get_id();
-	abstract function get_date();
-	abstract function get_link();
-	abstract function get_title();
-	abstract function get_description();
-	abstract function get_content();
-	abstract function get_comments_url();
-	abstract function get_comments_count();
-	abstract function get_categories();
-	abstract function get_enclosures();
-	abstract function get_author();
-	abstract function get_language();
+    abstract function get_id();
+    abstract function get_date();
+    abstract function get_link();
+    abstract function get_title();
+    abstract function get_description();
+    abstract function get_content();
+    abstract function get_comments_url();
+    abstract function get_comments_count();
+    abstract function get_categories();
+    abstract function get_enclosures();
+    abstract function get_author();
+    abstract function get_language();
 }
 

classes/ihandler.php

Indentation +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@
 <?php
 interface IHandler {
-	public function csrf_ignore($method);
-	public function before($method);
-	public function after();
+    public function csrf_ignore($method);
+    public function before($method);
+    public function after();
 }