PrivateBin / PrivateBin

lib/privatebin/db.php

Braces +34 added lines, -20 removed lines

@@ -70,7 +70,9 @@ 
         if (is_array($options))
         {
             // set table prefix if given
-            if (array_key_exists('tbl', $options)) self::$_prefix = $options['tbl'];
+            if (array_key_exists('tbl', $options)) {
+                self::$_prefix = $options['tbl'];
+            }
 
             // initialize the db connection with new options
             if (
@@ -121,9 +123,10 @@ 
                 {
                     self::_createConfigTable();
                     // if we only needed to create the config table, the DB is older then 0.22
-                    if ($db_tables_exist) $db_version = '0.21';
-                }
-                else
+                    if ($db_tables_exist) {
+                        $db_version = '0.21';
+                    }
+                } else
                 {
                     $db_version = self::_getConfig('VERSION');
                 }
@@ -133,8 +136,7 @@ 
                 {
                     self::_upgradeDatabase($db_version);
                 }
-            }
-            else
+            } else
             {
                 throw new Exception(
                     'Missing configuration for key dsn, usr, pwd or opt in the section model_options, please check your configuration file', 6
@@ -236,7 +238,9 @@ 
                 self::$_cache[$pasteid]->data = $paste['data'];
 
                 $meta = json_decode($paste['meta']);
-                if (!is_object($meta)) $meta = new stdClass;
+                if (!is_object($meta)) {
+                    $meta = new stdClass;
+                }
 
                 // support older attachments
                 if (property_exists($meta, 'attachment'))
@@ -263,13 +267,19 @@ 
                 $expire_date = (int) $paste['expiredate'];
                 if (
                     $expire_date > 0
-                ) self::$_cache[$pasteid]->meta->expire_date = $expire_date;
+                ) {
+                    self::$_cache[$pasteid]->meta->expire_date = $expire_date;
+                }
                 if (
                     $paste['opendiscussion']
-                ) self::$_cache[$pasteid]->meta->opendiscussion = true;
+                ) {
+                    self::$_cache[$pasteid]->meta->opendiscussion = true;
+                }
                 if (
                     $paste['burnafterreading']
-                ) self::$_cache[$pasteid]->meta->burnafterreading = true;
+                ) {
+                    self::$_cache[$pasteid]->meta->burnafterreading = true;
+                }
             }
         }
 
@@ -295,7 +305,9 @@ 
         );
         if (
             array_key_exists($pasteid, self::$_cache)
-        ) unset(self::$_cache[$pasteid]);
+        ) {
+            unset(self::$_cache[$pasteid]);
+        }
     }
 
     /**
@@ -309,7 +321,9 @@ 
     {
         if (
             !array_key_exists($pasteid, self::$_cache)
-        ) self::$_cache[$pasteid] = $this->read($pasteid);
+        ) {
+            self::$_cache[$pasteid] = $this->read($pasteid);
+        }
         return (bool) self::$_cache[$pasteid];
     }
 
@@ -367,10 +381,12 @@ 
                 $comments[$i]->data = $row['data'];
                 $comments[$i]->meta = new stdClass;
                 $comments[$i]->meta->postdate = (int) $row['postdate'];
-                if (array_key_exists('nickname', $row))
-                    $comments[$i]->meta->nickname = $row['nickname'];
-                if (array_key_exists('vizhash', $row))
-                    $comments[$i]->meta->vizhash = $row['vizhash'];
+                if (array_key_exists('nickname', $row)) {
+                                    $comments[$i]->meta->nickname = $row['nickname'];
+                }
+                if (array_key_exists('vizhash', $row)) {
+                                    $comments[$i]->meta->vizhash = $row['vizhash'];
+                }
             }
             ksort($comments);
         }
@@ -523,8 +539,7 @@ 
         if (self::$_type === 'mysql')
         {
             $after_key = ", PRIMARY KEY ($key)";
-        }
-        else
+        } else
         {
             $main_key = ' PRIMARY KEY';
         }
@@ -654,8 +669,7 @@ 
                         ' ADD PRIMARY KEY (dataid), MODIFY COLUMN data BLOB, ' .
                         'MODIFY COLUMN nickname BLOB,  MODIFY COLUMN vizhash BLOB;'
                     );
-                }
-                else
+                } else
                 {
                     self::$_db->exec(
                         'CREATE UNIQUE INDEX primary ON ' . self::_sanitizeIdentifier('paste') . '(dataid);'