PrivateBin / PrivateBin

tst/vizhash16x16.php

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
     {
         /* 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);
     }
@@ -18,7 +18,7 @@ 
     {
         /* Tear Down Routine */
         chmod($this->_path, 0700);
-        if(!@unlink($this->_file)) {
+        if (!@unlink($this->_file)) {
             throw new Exception('Error deleting file "' . $this->_file . '".');
         }
         helper::rmdir($this->_path);

tst/bootstrap.php

Spacing +8 added lines, -8 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-error_reporting( E_ALL | E_STRICT );
+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', '..');
@@ -154,19 +154,19 @@ 
     {
         $path .= DIRECTORY_SEPARATOR;
         $dir = dir($path);
-        while(false !== ($file = $dir->read())) {
-            if($file != '.' && $file != '..') {
-                if(is_dir($path . $file)) {
+        while (false !== ($file = $dir->read())) {
+            if ($file != '.' && $file != '..') {
+                if (is_dir($path . $file)) {
                     self::rmdir($path . $file);
-                } elseif(is_file($path . $file)) {
-                    if(!@unlink($path . $file)) {
+                } elseif (is_file($path . $file)) {
+                    if (!@unlink($path . $file)) {
                         throw new Exception('Error deleting file "' . $path . $file . '".');
                     }
                 }
             }
         }
         $dir->close();
-        if(!@rmdir($path)) {
+        if (!@rmdir($path)) {
             throw new Exception('Error deleting directory "' . $path . '".');
         }
     }
@@ -206,7 +206,7 @@ 
             $ini = fopen($pathToFile, 'a');
             foreach ($values as $section => $options) {
                 fwrite($ini, "[$section]" . PHP_EOL);
-                foreach($options as $option => $setting) {
+                foreach ($options as $option => $setting) {
                     if (is_null($setting)) {
                         continue;
                     } elseif (is_string($setting)) {

tst/i18n.php

Spacing +4 added lines, -4 removed lines

@@ -31,7 +31,7 @@ 
         i18n::loadTranslations();
         $this->assertEquals($this->_translations['en'], i18n::_('en'), 'browser language de');
         $this->assertEquals('0 Stunden', i18n::_('%d hours', 0), '0 hours in german');
-        $this->assertEquals('1 Stunde',  i18n::_('%d hours', 1), '1 hour in german');
+        $this->assertEquals('1 Stunde', i18n::_('%d hours', 1), '1 hour in german');
         $this->assertEquals('2 Stunden', i18n::_('%d hours', 2), '2 hours in french');
     }
 
@@ -41,7 +41,7 @@ 
         i18n::loadTranslations();
         $this->assertEquals($this->_translations['en'], i18n::_('en'), 'browser language de');
         $this->assertEquals('0 Stunden', i18n::_('%d hours', 0), '0 hours in german');
-        $this->assertEquals('1 Stunde',  i18n::_('%d hours', 1), '1 hour in german');
+        $this->assertEquals('1 Stunde', i18n::_('%d hours', 1), '1 hour in german');
         $this->assertEquals('2 Stunden', i18n::_('%d hours', 2), '2 hours in french');
     }
 
@@ -50,8 +50,8 @@ 
         $_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'fr-CH,fr;q=0.8,en-GB;q=0.6,en-US;q=0.4,en;q=0.2';
         i18n::loadTranslations();
         $this->assertEquals('fr', i18n::_('en'), 'browser language fr');
-        $this->assertEquals('0 heure',  i18n::_('%d hours', 0), '0 hours in french');
-        $this->assertEquals('1 heure',  i18n::_('%d hours', 1), '1 hour in french');
+        $this->assertEquals('0 heure', i18n::_('%d hours', 0), '0 hours in french');
+        $this->assertEquals('1 heure', i18n::_('%d hours', 1), '1 hour in french');
         $this->assertEquals('2 heures', i18n::_('%d hours', 2), '2 hours in french');
     }
 

tst/serversalt.php

Spacing +3 added lines, -3 removed lines

@@ -13,13 +13,13 @@ 
     {
         /* 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';
     }
 
@@ -43,7 +43,7 @@ 
             function mcrypt_create_iv($int, $flag)
             {
                 $randomSalt = '';
-                for($i = 0; $i < $int; ++$i) {
+                for ($i = 0; $i < $int; ++$i) {
                     $randomSalt .= base_convert(mt_rand(), 10, 16);
                 }
                 // hex2bin requires an even length, pad if necessary

tst/configGenerator.php

Spacing +2 added lines, -2 removed lines

@@ -418,7 +418,7 @@ 
                             while (list($path, $setting) = each($test['conditions'])) {
                                 if ($path == 'steps' && !in_array($step, $setting)) {
                                     continue 2;
-                                } elseif($path != 'steps') {
+                                } elseif ($path != 'steps') {
                                     list($section, $option) = explode('/', $path);
                                     if ($fullOptions[$section][$option] !== $setting) {
                                         continue 2;
@@ -512,7 +512,7 @@ 
     private function _getFunction($step, $key, &$options, $preCode, $testCode)
     {
         if (count($testCode) == 0) {
-            echo "skipping creation of test$step$key, no valid tests found for configuration: $options". PHP_EOL;
+            echo "skipping creation of test$step$key, no valid tests found for configuration: $options" . PHP_EOL;
             return '';
         }
 

tst/zerobin.php

Spacing +2 added lines, -2 removed lines

@@ -296,7 +296,7 @@ 
             $response['deletetoken'],
             'outputs valid delete token'
         );
-        $this->assertGreaterThanOrEqual($time + 300, $paste->meta->expire_date, 'time is set correctly');
+        $this->assertGreaterThanOrEqual($time+300, $paste->meta->expire_date, 'time is set correctly');
     }
 
     /**
@@ -328,7 +328,7 @@ 
             $response['deletetoken'],
             'outputs valid delete token'
         );
-        $this->assertGreaterThanOrEqual($time + 300, $paste->meta->expire_date, 'time is set correctly');
+        $this->assertGreaterThanOrEqual($time+300, $paste->meta->expire_date, 'time is set correctly');
         $this->assertEquals(1, $paste->meta->opendiscussion, 'discussion is enabled');
     }
 

lib/trafficlimiter.php

Spacing +3 added lines, -3 removed lines

@@ -115,15 +115,15 @@
         $tl = $GLOBALS['traffic_limiter'];
 
         // purge file of expired IPs to keep it small
-        foreach($tl as $key => $time)
+        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 {

lib/vizhash16x16.php

Spacing +44 added lines, -44 removed lines

@@ -89,38 +89,38 @@ 
         if (!function_exists('gd_info')) return '';
 
         // We hash the input string.
-        $hash=hash('sha1',$text.$this->salt).hash('md5',$text.$this->salt);
-        $hash=$hash.strrev($hash);  # more data to make graphics
+        $hash = hash('sha1', $text . $this->salt) . hash('md5', $text . $this->salt);
+        $hash = $hash . strrev($hash); # more data to make graphics
 
         // We convert the hash into an array of integers.
-        $this->VALUES=array();
-        for($i=0; $i<strlen($hash); $i=$i+2){ array_push($this->VALUES,hexdec(substr($hash,$i,2))); }
-        $this->VALUES_INDEX=0; // to walk the array.
+        $this->VALUES = array();
+        for ($i = 0; $i < strlen($hash); $i = $i+2) { array_push($this->VALUES, hexdec(substr($hash, $i, 2))); }
+        $this->VALUES_INDEX = 0; // to walk the array.
 
         // Then use these integers to drive the creation of an image.
-        $image = imagecreatetruecolor($this->width,$this->height);
+        $image = imagecreatetruecolor($this->width, $this->height);
 
-        $r0 = $this->getInt();$r=$r0;
-        $g0 = $this->getInt();$g=$g0;
-        $b0 = $this->getInt();$b=$b0;
+        $r0 = $this->getInt(); $r = $r0;
+        $g0 = $this->getInt(); $g = $g0;
+        $b0 = $this->getInt(); $b = $b0;
 
         // First, create an image with a specific gradient background.
-        $op='v'; if (($this->getInt()%2)==0) { $op='h'; };
-        $image = $this->degrade($image,$op,array($r0,$g0,$b0),array(0,0,0));
+        $op = 'v'; if (($this->getInt() % 2) == 0) { $op = 'h'; };
+        $image = $this->degrade($image, $op, array($r0, $g0, $b0), array(0, 0, 0));
 
-        for($i=0; $i<7; $i=$i+1)
+        for ($i = 0; $i < 7; $i = $i+1)
         {
-            $action=$this->getInt();
-            $color = imagecolorallocate($image, $r,$g,$b);
-            $r = ($r0 + $this->getInt()/25)%256;
-            $g = ($g0 + $this->getInt()/25)%256;
-            $b = ($b0 + $this->getInt()/25)%256;
-            $r0=$r; $g0=$g; $b0=$b;
-            $this->drawshape($image,$action,$color);
+            $action = $this->getInt();
+            $color = imagecolorallocate($image, $r, $g, $b);
+            $r = ($r0+$this->getInt() / 25) % 256;
+            $g = ($g0+$this->getInt() / 25) % 256;
+            $b = ($b0+$this->getInt() / 25) % 256;
+            $r0 = $r; $g0 = $g; $b0 = $b;
+            $this->drawshape($image, $action, $color);
         }
 
-        $color = imagecolorallocate($image,$this->getInt(),$this->getInt(),$this->getInt());
-        $this->drawshape($image,$this->getInt(),$color);
+        $color = imagecolorallocate($image, $this->getInt(), $this->getInt(), $this->getInt());
+        $this->drawshape($image, $this->getInt(), $color);
         ob_start();
         imagepng($image);
         $imagedata = ob_get_contents();
@@ -138,7 +138,7 @@ 
      */
     private function getInt()
     {
-        $v= $this->VALUES[$this->VALUES_INDEX];
+        $v = $this->VALUES[$this->VALUES_INDEX];
         $this->VALUES_INDEX++;
         $this->VALUES_INDEX %= count($this->VALUES); // Warp around the array
         return $v;
@@ -152,7 +152,7 @@ 
      */
     private function getX()
     {
-        return $this->width*$this->getInt()/256;
+        return $this->width * $this->getInt() / 256;
     }
 
     /**
@@ -163,7 +163,7 @@ 
      */
     private function getY()
     {
-        return $this->height*$this->getInt()/256;
+        return $this->height * $this->getInt() / 256;
     }
 
     /**
@@ -179,22 +179,22 @@ 
      * @param  array $color2
      * @return resource
      */
-    private function degrade($img,$direction,$color1,$color2)
+    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),
-                    (($color2[2]-$color1[2])/$size)
+                    (($color2[0]-$color1[0]) / $size),
+                    (($color2[1]-$color1[1]) / $size),
+                    (($color2[2]-$color1[2]) / $size)
             );
-            for($i=0;$i<$size;$i++)
+            for ($i = 0; $i < $size; $i++)
             {
-                    $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)); }
+                    $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)); }
             }
             return $img;
     }
@@ -208,24 +208,24 @@ 
      * @param  int $color
      * @return void
      */
-    private function drawshape($image,$action,$color)
+    private function drawshape($image, $action, $color)
     {
-        switch($action%7)
+        switch ($action % 7)
         {
             case 0:
-                ImageFilledRectangle ($image,$this->getX(),$this->getY(),$this->getX(),$this->getY(),$color);
+                ImageFilledRectangle($image, $this->getX(), $this->getY(), $this->getX(), $this->getY(), $color);
                 break;
             case 1:
             case 2:
-                ImageFilledEllipse ($image, $this->getX(), $this->getY(), $this->getX(), $this->getY(), $color);
+                ImageFilledEllipse($image, $this->getX(), $this->getY(), $this->getX(), $this->getY(), $color);
                 break;
             case 3:
-                $points = array($this->getX(), $this->getY(), $this->getX(), $this->getY(), $this->getX(), $this->getY(),$this->getX(), $this->getY());
-                ImageFilledPolygon ($image, $points, 4, $color);
+                $points = array($this->getX(), $this->getY(), $this->getX(), $this->getY(), $this->getX(), $this->getY(), $this->getX(), $this->getY());
+                ImageFilledPolygon($image, $points, 4, $color);
                 break;
             default:
-                $start=$this->getInt()*360/256; $end=$start+$this->getInt()*180/256;
-                ImageFilledArc ($image, $this->getX(), $this->getY(), $this->getX(), $this->getY(),$start,$end,$color,IMG_ARC_PIE);
+                $start = $this->getInt() * 360 / 256; $end = $start+$this->getInt() * 180 / 256;
+                ImageFilledArc($image, $this->getX(), $this->getY(), $this->getX(), $this->getY(), $start, $end, $color, IMG_ARC_PIE);
         }
     }
 }

lib/model/paste.php

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
                 throw new Exception(zerobin::GENERIC_ERROR, 63);
             }
             // We kindly provide the remaining time before expiration (in seconds)
-            $this->_data->meta->remaining_time = $this->_data->meta->expire_date - time();
+            $this->_data->meta->remaining_time = $this->_data->meta->expire_date-time();
         }
 
         // set formatter for for the view.
@@ -217,7 +217,7 @@ 
             // 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;
     }
 
     /**