PrivateBin / PrivateBin

tst/vizhash16x16.php

Braces +3 added lines, -1 removed lines

@@ -9,7 +9,9 @@
     {
         /* Setup Routine */
         $this->_path = PATH . 'data';
-        if(!is_dir($this->_path)) mkdir($this->_path);
+        if(!is_dir($this->_path)) {
+            mkdir($this->_path);
+        }
         $this->_file = $this->_path . DIRECTORY_SEPARATOR . 'vizhash.png';
         serversalt::setPath($this->_path);
     }

tst/bootstrap.php

Braces +21 added lines, -10 removed lines

@@ -2,10 +2,18 @@ 
 error_reporting( E_ALL | E_STRICT );
 
 // change this, if your php files and data is outside of your webservers document root
-if (!defined('PUBLIC_PATH')) define('PUBLIC_PATH', '..');
-if (!defined('PATH')) define('PATH', '..' . DIRECTORY_SEPARATOR);
-if (!defined('CONF')) define('CONF', PATH . 'cfg' . DIRECTORY_SEPARATOR . 'conf.ini');
-if (!is_file(CONF)) copy(CONF . '.sample', CONF);
+if (!defined('PUBLIC_PATH')) {
+    define('PUBLIC_PATH', '..');
+}
+if (!defined('PATH')) {
+    define('PATH', '..' . DIRECTORY_SEPARATOR);
+}
+if (!defined('CONF')) {
+    define('CONF', PATH . 'cfg' . DIRECTORY_SEPARATOR . 'conf.ini');
+}
+if (!is_file(CONF)) {
+    copy(CONF . '.sample', CONF);
+}
 
 require PATH . 'lib/auto.php';
 
@@ -100,8 +108,9 @@ 
         $example = self::getPaste();
         // the JSON shouldn't contain the salt
         unset($example['meta']['salt']);
-        if (count($meta))
-            $example['meta'] = $meta;
+        if (count($meta)) {
+                    $example['meta'] = $meta;
+        }
         $example['comments'] = array();
         $example['comment_count'] = 0;
         $example['comment_offset'] = 0;
@@ -178,8 +187,9 @@ 
      */
     public static function confBackup()
     {
-        if (!is_file(CONF . '.bak') && is_file(CONF))
-            rename(CONF, CONF . '.bak');
+        if (!is_file(CONF . '.bak') && is_file(CONF)) {
+                    rename(CONF, CONF . '.bak');
+        }
     }
 
     /**
@@ -189,8 +199,9 @@ 
      */
     public static function confRestore()
     {
-        if (is_file(CONF . '.bak'))
-            rename(CONF . '.bak', CONF);
+        if (is_file(CONF . '.bak')) {
+                    rename(CONF . '.bak', CONF);
+        }
     }
 
     /**

tst/serversalt.php

Braces +9 added lines, -3 removed lines

@@ -13,13 +13,17 @@ 
     {
         /* Setup Routine */
         $this->_path = PATH . 'data';
-        if(!is_dir($this->_path)) mkdir($this->_path);
+        if(!is_dir($this->_path)) {
+            mkdir($this->_path);
+        }
         serversalt::setPath($this->_path);
 
         $this->_otherPath = $this->_path . DIRECTORY_SEPARATOR . 'foo';
 
         $this->_invalidPath = $this->_path . DIRECTORY_SEPARATOR . 'bar';
-        if(!is_dir($this->_invalidPath)) mkdir($this->_invalidPath);
+        if(!is_dir($this->_invalidPath)) {
+            mkdir($this->_invalidPath);
+        }
         $this->_invalidFile = $this->_invalidPath . DIRECTORY_SEPARATOR . 'salt.php';
     }
 
@@ -39,7 +43,9 @@ 
         // mcrypt mock
         if (!function_exists('mcrypt_create_iv'))
         {
-            if (!defined('MCRYPT_DEV_URANDOM')) define('MCRYPT_DEV_URANDOM', 1);
+            if (!defined('MCRYPT_DEV_URANDOM')) {
+                define('MCRYPT_DEV_URANDOM', 1);
+            }
             function mcrypt_create_iv($int, $flag)
             {
                 $randomSalt = '';

tst/zerobin.php

Braces +3 added lines, -2 removed lines

@@ -22,8 +22,9 @@
         $_POST = array();
         $_GET = array();
         $_SERVER = array();
-        if ($this->_model->exists(helper::getPasteId()))
-            $this->_model->delete(helper::getPasteId());
+        if ($this->_model->exists(helper::getPasteId())) {
+                    $this->_model->delete(helper::getPasteId());
+        }
         helper::confRestore();
     }
 

lib/trafficlimiter.php

Braces +3 added lines, -1 removed lines

@@ -95,7 +95,9 @@
     public static function canPass()
     {
         // disable limits if set to less then 1
-        if (self::$_limit < 1) return true;
+        if (self::$_limit < 1) {
+            return true;
+        }
 
         $ip = hash_hmac('sha256', self::getIp(), serversalt::get());
 

lib/vizhash16x16.php

Braces +5 added lines, -5 removed lines

@@ -86,7 +86,9 @@ 
      */
     public function generate($text)
     {
-        if (!function_exists('gd_info')) return '';
+        if (!function_exists('gd_info')) {
+            return '';
+        }
 
         // We hash the input string.
         $hash=hash('sha1',$text.$this->salt).hash('md5',$text.$this->salt);
@@ -181,8 +183,7 @@ 
      */
     private function degrade($img,$direction,$color1,$color2)
     {
-            if($direction=='h') { $size = imagesx($img); $sizeinv = imagesy($img); }
-            else { $size = imagesy($img); $sizeinv = imagesx($img);}
+            if($direction=='h') { $size = imagesx($img); $sizeinv = imagesy($img); } else { $size = imagesy($img); $sizeinv = imagesx($img);}
             $diffs = array(
                     (($color2[0]-$color1[0])/$size),
                     (($color2[1]-$color1[1])/$size),
@@ -193,8 +194,7 @@ 
                     $r = $color1[0]+($diffs[0]*$i);
                     $g = $color1[1]+($diffs[1]*$i);
                     $b = $color1[2]+($diffs[2]*$i);
-                    if($direction=='h') { imageline($img,$i,0,$i,$sizeinv,imagecolorallocate($img,$r,$g,$b)); }
-                    else { imageline($img,0,$i,$sizeinv,$i,imagecolorallocate($img,$r,$g,$b)); }
+                    if($direction=='h') { imageline($img,$i,0,$i,$sizeinv,imagecolorallocate($img,$r,$g,$b)); } else { imageline($img,0,$i,$sizeinv,$i,imagecolorallocate($img,$r,$g,$b)); }
             }
             return $img;
     }

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(zerobin::GENERIC_ERROR, 64);
+        if ($this->_data === false) {
+            throw new Exception(zerobin::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/model/abstract.php

Braces +6 added lines, -2 removed lines

@@ -86,7 +86,9 @@ 
      */
     public function setId($id)
     {
-        if (!self::isValidId($id)) throw new Exception('Invalid paste ID.', 60);
+        if (!self::isValidId($id)) {
+            throw new Exception('Invalid paste ID.', 60);
+        }
         $this->_id = $id;
     }
 
@@ -100,7 +102,9 @@ 
      */
     public function setData($data)
     {
-        if (!sjcl::isValid($data)) throw new Exception('Invalid data.', 61);
+        if (!sjcl::isValid($data)) {
+            throw new Exception('Invalid data.', 61);
+        }
         $this->_data->data = $data;
 
         // We just want a small hash to avoid collisions:

lib/model/comment.php

Braces +21 added lines, -10 removed lines

@@ -59,16 +59,19 @@ 
     {
         // Make sure paste exists.
         $pasteid = $this->getPaste()->getId();
-        if (!$this->getPaste()->exists())
-            throw new Exception('Invalid data.', 67);
+        if (!$this->getPaste()->exists()) {
+                    throw new Exception('Invalid data.', 67);
+        }
 
         // Make sure the discussion is opened in this paste and in configuration.
-        if (!$this->getPaste()->isOpendiscussion() || !$this->_conf->getKey('discussion'))
-            throw new Exception('Invalid data.', 68);
+        if (!$this->getPaste()->isOpendiscussion() || !$this->_conf->getKey('discussion')) {
+                    throw new Exception('Invalid data.', 68);
+        }
 
         // Check for improbable collision.
-        if ($this->exists())
-            throw new Exception('You are unlucky. Try again.', 69);
+        if ($this->exists()) {
+                    throw new Exception('You are unlucky. Try again.', 69);
+        }
 
         $this->_data->meta->postdate = time();
 
@@ -80,7 +83,9 @@ 
                 $this->getId(),
                 json_decode(json_encode($this->_data), true)
             ) === false
-        ) throw new Exception('Error saving comment. Sorry.', 70);
+        ) {
+            throw new Exception('Error saving comment. Sorry.', 70);
+        }
     }
 
     /**
@@ -145,7 +150,9 @@ 
      */
     public function setParentId($id)
     {
-        if (!self::isValidId($id)) throw new Exception('Invalid paste ID.', 65);
+        if (!self::isValidId($id)) {
+            throw new Exception('Invalid paste ID.', 65);
+        }
         $this->_data->meta->parentid = $id;
     }
 
@@ -157,7 +164,9 @@ 
      */
     public function getParentId()
     {
-        if (!property_exists($this->_data->meta, 'parentid')) $this->_data->meta->parentid = '';
+        if (!property_exists($this->_data->meta, 'parentid')) {
+            $this->_data->meta->parentid = '';
+        }
         return $this->_data->meta->parentid;
     }
 
@@ -171,7 +180,9 @@ 
      */
     public function setNickname($nickname)
     {
-        if (!sjcl::isValid($nickname)) throw new Exception('Invalid data.', 66);
+        if (!sjcl::isValid($nickname)) {
+            throw new Exception('Invalid data.', 66);
+        }
         $this->_data->meta->nickname = $nickname;
 
         // Generation of the anonymous avatar (Vizhash):