PrivateBin / PrivateBin

lib/model/paste.php

Braces +40 added lines, -25 removed lines

@@ -27,7 +27,9 @@ 
     public function get()
     {
         $this->_data = $this->_store->read($this->getId());
-        if ($this->_data === false) throw new Exception(privatebin::GENERIC_ERROR, 64);
+        if ($this->_data === false) {
+            throw new Exception(privatebin::GENERIC_ERROR, 64);
+        }
 
         // check if paste has expired and delete it if neccessary.
         if (property_exists($this->_data->meta, 'expire_date'))
@@ -48,8 +50,7 @@ 
             if (property_exists($this->_data->meta, 'syntaxcoloring') && $this->_data->meta->syntaxcoloring === true)
             {
                 $this->_data->meta->formatter = 'syntaxhighlighting';
-            }
-            else
+            } else
             {
                 $this->_data->meta->formatter = $this->_conf->getKey('defaultformatter');
             }
@@ -77,8 +78,9 @@ 
     public function store()
     {
         // Check for improbable collision.
-        if ($this->exists())
-            throw new Exception('You are unlucky. Try again.', 75);
+        if ($this->exists()) {
+                    throw new Exception('You are unlucky. Try again.', 75);
+        }
 
         $this->_data->meta->postdate = time();
         $this->_data->meta->salt = serversalt::generate();
@@ -89,7 +91,9 @@ 
                 $this->getId(),
                 json_decode(json_encode($this->_data), true)
             ) === false
-        ) throw new Exception('Error saving paste. Sorry.', 76);
+        ) {
+            throw new Exception('Error saving paste. Sorry.', 76);
+        }
     }
 
     /**
@@ -133,7 +137,9 @@ 
         $comment = new model_comment($this->_conf, $this->_store);
         $comment->setPaste($this);
         $comment->setParentId($parentId);
-        if ($commentId !== null) $comment->setId($commentId);
+        if ($commentId !== null) {
+            $comment->setId($commentId);
+        }
         return $comment;
     }
 
@@ -160,7 +166,9 @@ 
      */
     public function getDeleteToken()
     {
-        if (!property_exists($this->_data->meta, 'salt')) $this->get();
+        if (!property_exists($this->_data->meta, 'salt')) {
+            $this->get();
+        }
         return hash_hmac(
             $this->_conf->getKey('zerobincompatibility') ? 'sha1' : 'sha256',
             $this->getId(),
@@ -178,8 +186,9 @@ 
      */
     public function setAttachment($attachment)
     {
-        if (!$this->_conf->getKey('fileupload') || !sjcl::isValid($attachment))
-            throw new Exception('Invalid attachment.', 71);
+        if (!$this->_conf->getKey('fileupload') || !sjcl::isValid($attachment)) {
+                    throw new Exception('Invalid attachment.', 71);
+        }
         $this->_data->meta->attachment = $attachment;
     }
 
@@ -193,8 +202,9 @@ 
      */
     public function setAttachmentName($attachmentname)
     {
-        if (!$this->_conf->getKey('fileupload') || !sjcl::isValid($attachmentname))
-            throw new Exception('Invalid attachment.', 72);
+        if (!$this->_conf->getKey('fileupload') || !sjcl::isValid($attachmentname)) {
+                    throw new Exception('Invalid attachment.', 72);
+        }
         $this->_data->meta->attachmentname = $attachmentname;
     }
 
@@ -211,13 +221,14 @@ 
         if (array_key_exists($expiration, $expire_options))
         {
             $expire = $expire_options[$expiration];
-        }
-        else
+        } else
         {
             // using getKey() to ensure a default value is present
             $expire = $this->_conf->getKey($this->_conf->getKey('default', 'expire'), 'expire_options');
         }
-        if ($expire > 0) $this->_data->meta->expire_date = time() + $expire;
+        if ($expire > 0) {
+            $this->_data->meta->expire_date = time() + $expire;
+        }
     }
 
     /**
@@ -233,11 +244,11 @@ 
         if ($burnafterreading === '0')
         {
             $this->_data->meta->burnafterreading = false;
-        }
-        else
+        } else
         {
-            if ($burnafterreading !== '1')
-                throw new Exception('Invalid data.', 73);
+            if ($burnafterreading !== '1') {
+                            throw new Exception('Invalid data.', 73);
+            }
             $this->_data->meta->burnafterreading = true;
             $this->_data->meta->opendiscussion = false;
         }
@@ -260,11 +271,11 @@ 
         )
         {
             $this->_data->meta->opendiscussion = false;
-        }
-        else
+        } else
         {
-            if ($opendiscussion !== '1')
-                throw new Exception('Invalid data.', 74);
+            if ($opendiscussion !== '1') {
+                            throw new Exception('Invalid data.', 74);
+            }
             $this->_data->meta->opendiscussion = true;
         }
     }
@@ -295,7 +306,9 @@ 
      */
     public function isBurnafterreading()
     {
-        if (!property_exists($this->_data, 'data')) $this->get();
+        if (!property_exists($this->_data, 'data')) {
+            $this->get();
+        }
         return property_exists($this->_data->meta, 'burnafterreading') &&
                $this->_data->meta->burnafterreading === true;
     }
@@ -310,7 +323,9 @@ 
      */
     public function isOpendiscussion()
     {
-        if (!property_exists($this->_data, 'data')) $this->get();
+        if (!property_exists($this->_data, 'data')) {
+            $this->get();
+        }
         return property_exists($this->_data->meta, 'opendiscussion') &&
                $this->_data->meta->opendiscussion === true;
     }

lib/privatebin/data.php

Spacing +5 added lines, -5 removed lines

@@ -42,7 +42,7 @@ 
             array_key_exists('dir', $options)
         ) self::$_dir = $options['dir'] . DIRECTORY_SEPARATOR;
         // if needed initialize the singleton
-        if(!(self::$_instance instanceof privatebin_data)) {
+        if (!(self::$_instance instanceof privatebin_data)) {
             self::$_instance = new self;
             self::_init();
         }
@@ -74,7 +74,7 @@ 
      */
     public function read($pasteid)
     {
-        if(!$this->exists($pasteid)) return false;
+        if (!$this->exists($pasteid)) return false;
         $paste = json_decode(
             file_get_contents(self::_dataid2path($pasteid) . $pasteid)
         );
@@ -111,7 +111,7 @@ 
             $dir = dir($discdir);
             while (false !== ($filename = $dir->read()))
             {
-                if (is_file($discdir.$filename)) @unlink($discdir.$filename);
+                if (is_file($discdir . $filename)) @unlink($discdir . $filename);
             }
             $dir->close();
 
@@ -227,7 +227,7 @@ 
             file_put_contents(
                 self::$_dir . '.htaccess',
                 'Allow from none' . PHP_EOL .
-                'Deny from all'. PHP_EOL
+                'Deny from all' . PHP_EOL
             );
         }
     }
@@ -249,7 +249,7 @@ 
      */
     private static function _dataid2path($dataid)
     {
-        return self::$_dir . substr($dataid,0,2) . '/' . substr($dataid,2,2) . '/';
+        return self::$_dir . substr($dataid, 0, 2) . '/' . substr($dataid, 2, 2) . '/';
     }
 
     /**

lib/privatebin/db.php

Spacing +5 added lines, -6 removed lines

@@ -63,7 +63,7 @@ 
     public static function getInstance($options = null)
     {
         // if needed initialize the singleton
-        if(!(self::$_instance instanceof privatebin_db)) {
+        if (!(self::$_instance instanceof privatebin_db)) {
             self::$_instance = new self;
         }
 
@@ -152,7 +152,7 @@ 
         if (
             array_key_exists($pasteid, self::$_cache)
         ) {
-            if(false !== self::$_cache[$pasteid]) {
+            if (false !== self::$_cache[$pasteid]) {
                 return false;
             } else {
                 unset(self::$_cache[$pasteid]);
@@ -223,7 +223,7 @@ 
                 array($pasteid), true
             );
 
-            if(false !== $paste) {
+            if (false !== $paste) {
                 // create object
                 self::$_cache[$pasteid] = new stdClass;
                 self::$_cache[$pasteid]->data = $paste['data'];
@@ -421,8 +421,7 @@ 
         $statement = self::$_db->prepare($sql);
         $statement->execute($params);
         $result = $firstOnly ?
-            $statement->fetch(PDO::FETCH_ASSOC) :
-            $statement->fetchAll(PDO::FETCH_ASSOC);
+            $statement->fetch(PDO::FETCH_ASSOC) : $statement->fetchAll(PDO::FETCH_ASSOC);
         $statement->closeCursor();
         return $result;
     }
@@ -438,7 +437,7 @@ 
      */
     private static function _getTableQuery($type)
     {
-        switch($type)
+        switch ($type)
         {
             case 'ibm':
                 $sql = 'SELECT tabname FROM SYSCAT.TABLES ';