PrivateBin / PrivateBin

lib/i18n.php

Spacing +2 added lines, -2 removed lines

@@ -112,7 +112,7 @@ 
         {
             $number = (int) $args[1];
             $key = self::_getPluralForm($number);
-            $max = count(self::$_translations[$messageId]) - 1;
+            $max = count(self::$_translations[$messageId])-1;
             if ($key > $max) $key = $max;
 
             $args[0] = self::$_translations[$messageId][$key];
@@ -386,7 +386,7 @@ 
     protected static function _matchLanguage($a, $b) {
         $a = explode('-', $a);
         $b = explode('-', $b);
-        for ($i=0, $n = min(count($a), count($b)); $i < $n; ++$i)
+        for ($i = 0, $n = min(count($a), count($b)); $i < $n; ++$i)
         {
             if ($a[$i] !== $b[$i]) break;
         }

lib/persistence.php

Braces +4 added lines, -4 removed lines

@@ -52,8 +52,7 @@ 
         if (strlen($filename))
         {
             return self::$_path . DIRECTORY_SEPARATOR . $filename;
-        }
-        else
+        } else
         {
             return self::$_path;
         }
@@ -84,9 +83,10 @@ 
     protected static function _initialize()
     {
         // Create storage directory if it does not exist.
-        if (!is_dir(self::$_path))
-            if (!@mkdir(self::$_path))
+        if (!is_dir(self::$_path)) {
+                    if (!@mkdir(self::$_path))
                 throw new Exception('unable to create directory ' . self::$_path, 10);
+        }
 
         // Create .htaccess file if it does not exist.
         $file = self::$_path . DIRECTORY_SEPARATOR . '.htaccess';

lib/privatebin/data.php

Braces +36 added lines, -12 removed lines

@@ -40,7 +40,9 @@ 
         if (
             is_array($options) &&
             array_key_exists('dir', $options)
-        ) self::$_dir = $options['dir'] . DIRECTORY_SEPARATOR;
+        ) {
+            self::$_dir = $options['dir'] . DIRECTORY_SEPARATOR;
+        }
         // if needed initialize the singleton
         if (!(self::$_instance instanceof privatebin_data)) {
             self::$_instance = new self;
@@ -60,8 +62,12 @@ 
     public function create($pasteid, $paste)
     {
         $storagedir = self::_dataid2path($pasteid);
-        if (is_file($storagedir . $pasteid)) return false;
-        if (!is_dir($storagedir)) mkdir($storagedir, 0705, true);
+        if (is_file($storagedir . $pasteid)) {
+            return false;
+        }
+        if (!is_dir($storagedir)) {
+            mkdir($storagedir, 0705, true);
+        }
         return (bool) @file_put_contents($storagedir . $pasteid, json_encode($paste));
     }
 
@@ -74,7 +80,9 @@ 
      */
     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 +119,9 @@ 
             $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();
 
@@ -146,8 +156,12 @@ 
     {
         $storagedir = self::_dataid2discussionpath($pasteid);
         $filename = $pasteid . '.' . $commentid . '.' . $parentid;
-        if (is_file($storagedir . $filename)) return false;
-        if (!is_dir($storagedir)) mkdir($storagedir, 0705, true);
+        if (is_file($storagedir . $filename)) {
+            return false;
+        }
+        if (!is_dir($storagedir)) {
+            mkdir($storagedir, 0705, true);
+        }
         return (bool) @file_put_contents($storagedir . $filename, json_encode($comment));
     }
 
@@ -245,15 +259,21 @@ 
                 $secondKey = array_rand($secondLevel);
                 $path = self::$_dir . $firstLevel[$firstKey] .
                     DIRECTORY_SEPARATOR . $secondLevel[$secondKey];
-                if (!is_dir($path)) continue;
+                if (!is_dir($path)) {
+                    continue;
+                }
                 $thirdLevel = array_filter(
                     scandir($path),
                     array('model_paste', 'isValidId')
                 );
-                if (count($thirdLevel) == 0) continue;
+                if (count($thirdLevel) == 0) {
+                    continue;
+                }
                 $thirdKey = array_rand($thirdLevel);
                 $pasteid = $thirdLevel[$thirdKey];
-                if (in_array($pasteid, $pastes)) continue;
+                if (in_array($pasteid, $pastes)) {
+                    continue;
+                }
 
                 if ($this->exists($pasteid))
                 {
@@ -264,7 +284,9 @@ 
                     )
                     {
                         $pastes[] = $pasteid;
-                        if (count($pastes) >= $batchsize) break;
+                        if (count($pastes) >= $batchsize) {
+                            break;
+                        }
                     }
                 }
             }
@@ -282,7 +304,9 @@ 
     private static function _init()
     {
         // Create storage directory if it does not exist.
-        if (!is_dir(self::$_dir)) mkdir(self::$_dir, 0705);
+        if (!is_dir(self::$_dir)) {
+            mkdir(self::$_dir, 0705);
+        }
         // Create .htaccess file if it does not exist.
         if (!is_file(self::$_dir . '.htaccess'))
         {

lib/trafficlimiter.php

Spacing +2 added lines, -2 removed lines

@@ -117,13 +117,13 @@
         // purge file of expired IPs to keep it small
         foreach ($tl as $key => $time)
         {
-            if ($time + self::$_limit < $now)
+            if ($time+self::$_limit < $now)
             {
                 unset($tl[$key]);
             }
         }
 
-        if (array_key_exists($ip, $tl) && ($tl[$ip] + self::$_limit >= $now))
+        if (array_key_exists($ip, $tl) && ($tl[$ip]+self::$_limit >= $now))
         {
             $result = false;
         } else {