From: Maryana Rozhankivska <mariroz@mr.lviv.ua>
Date: Tue, 8 Apr 2014 08:49:41 +0000 (+0300)
Subject: code formatting changes: tabs replaced with spaces, some other small formatting enhan... 
X-Git-Tag: 1.6.1b^2~6^2
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=a8ef1f3f43236908fdabebf795cf7de370b538ec;p=github%2Fwallabag%2Fwallabag.git

code formatting changes: tabs replaced with spaces, some other small formatting enhancements
---

a8ef1f3f43236908fdabebf795cf7de370b538ec
diff --cc inc/poche/Poche.class.php
index 90fbcb2d,a7bee65d..613377c6
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@@ -844,18 -844,18 +844,18 @@@ class Poch
            $read = 0;
            foreach (array('ol','ul') as $list) {
              foreach ($html->find($list) as $ul) {
 -                foreach ($ul->find('li') as $li) {
 -                  $tmpEntry = array();
 -                    $a = $li->find('a');
 -                    $tmpEntry['url'] = $a[0]->href;
 -                    $tmpEntry['tags'] = $a[0]->tags;
 -                    $tmpEntry['is_read'] = $read;
 -                    if ($tmpEntry['url']) {
 -                      $data[] = $tmpEntry;
 -                    }
 -                }
 -                # the second <ol/ul> is for read links
 -                $read = ((sizeof($data) && $read)?0:1);
 +              foreach ($ul->find('li') as $li) {
 +                $tmpEntry = array();
-                 $a = $li->find('a');
-                 $tmpEntry['url'] = $a[0]->href;
-                 $tmpEntry['tags'] = $a[0]->tags;
-                 $tmpEntry['is_read'] = $read;
-                 if ($tmpEntry['url']) {
-                   $data[] = $tmpEntry;
-                 }
++                  $a = $li->find('a');
++                  $tmpEntry['url'] = $a[0]->href;
++                  $tmpEntry['tags'] = $a[0]->tags;
++                  $tmpEntry['is_read'] = $read;
++                  if ($tmpEntry['url']) {
++                    $data[] = $tmpEntry;
++                  }
 +              }
 +              # the second <ol/ul> is for read links
 +              $read = ((sizeof($data) && $read)?0:1);
              }
            }
          }
@@@ -943,16 -942,16 +943,15 @@@
       * export poche entries in json
       * @return json all poche entries
       */
--    public function export()
--    {
-     $filename = "wallabag-export-".$this->user->getId()."-".date("Y-m-d").".json";
-     header('Content-Disposition: attachment; filename='.$filename);
 -        $filename = "wallabag-export-".$this->user->getId()."-".date("Y-m-d").".json";
 -        header('Content-Disposition: attachment; filename='.$filename);
--
--        $entries = $this->store->retrieveAll($this->user->getId());
--        echo $this->tpl->render('export.twig', array(
--            'export' => Tools::renderJson($entries),
--        ));
--        Tools::logm('export view');
++    public function export() {
++      $filename = "wallabag-export-".$this->user->getId()."-".date("Y-m-d").".json";
++      header('Content-Disposition: attachment; filename='.$filename);
++
++      $entries = $this->store->retrieveAll($this->user->getId());
++      echo $this->tpl->render('export.twig', array(
++          'export' => Tools::renderJson($entries),
++      ));
++      Tools::logm('export view');
      }
  
      /**
@@@ -960,43 -959,43 +959,42 @@@
       * @param  string $which 'prod' or 'dev'
       * @return string        latest $which version
       */
--    private function getPocheVersion($which = 'prod')
--    {
--        $cache_file = CACHE . '/' . $which;
--        $check_time = time();
--
--        # checks if the cached version file exists
--        if (file_exists($cache_file) && (filemtime($cache_file) > (time() - 86400 ))) {
--           $version = file_get_contents($cache_file);
--           $check_time = filemtime($cache_file);
--        } else {
--           $version = file_get_contents('http://static.wallabag.org/versions/' . $which);
--           file_put_contents($cache_file, $version, LOCK_EX);
--        }
--        return array($version, $check_time);
++    private function getPocheVersion($which = 'prod') {
++      $cache_file = CACHE . '/' . $which;
++      $check_time = time();
++
++      # checks if the cached version file exists
++      if (file_exists($cache_file) && (filemtime($cache_file) > (time() - 86400 ))) {
++         $version = file_get_contents($cache_file);
++         $check_time = filemtime($cache_file);
++      } else {
++         $version = file_get_contents('http://static.wallabag.org/versions/' . $which);
++         file_put_contents($cache_file, $version, LOCK_EX);
++      }
++      return array($version, $check_time);
      }
  
      public function generateToken()
      {
--        if (ini_get('open_basedir') === '') {
-       if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-       echo 'This is a server using Windows!';
-       // alternative to /dev/urandom for Windows
-       $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20);
-       } else {
-       $token = substr(base64_encode(file_get_contents('/dev/urandom', false, null, 0, 20)), 0, 15);
-       }
 -            if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
 -            echo 'This is a server using Windows!';
 -            // alternative to /dev/urandom for Windows
 -            $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20);
 -            } else {
 -            $token = substr(base64_encode(file_get_contents('/dev/urandom', false, null, 0, 20)), 0, 15);
 -            }
--        }
--        else {
--            $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20);
++      if (ini_get('open_basedir') === '') {
++        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
++          echo 'This is a server using Windows!';
++          // alternative to /dev/urandom for Windows
++          $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20);
++        } else {
++          $token = substr(base64_encode(file_get_contents('/dev/urandom', false, null, 0, 20)), 0, 15);
          }
++      }
++      else {
++        $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20);
++      }
  
--        $token = str_replace('+', '', $token);
--        $this->store->updateUserConfig($this->user->getId(), 'token', $token);
--        $currentConfig = $_SESSION['poche_user']->config;
--        $currentConfig['token'] = $token;
--        $_SESSION['poche_user']->setConfig($currentConfig);
--        Tools::redirect();
++      $token = str_replace('+', '', $token);
++      $this->store->updateUserConfig($this->user->getId(), 'token', $token);
++      $currentConfig = $_SESSION['poche_user']->config;
++      $currentConfig['token'] = $token;
++      $_SESSION['poche_user']->setConfig($currentConfig);
++      Tools::redirect();
      }
  
      public function generateFeeds($token, $user_id, $tag_id, $type = 'home')