mysociety / theyworkforyou

classes/Utility/LibFilter.php

Braces +13 added lines, -6 removed lines

@@ -177,7 +177,8 @@ 
             $data = preg_replace("/<([^>]*?)(?=<|$)/", "<$1>", $data);
             $data = preg_replace("/(^|>)([^<]*?)(?=>)/", "$1<$2", $data);
 
-        } else {
+        }
+        else {
 
             #
             # escape stray brackets
@@ -231,7 +232,8 @@ 
                         return '</'.$name.'>';
                     }
                 }
-            } else {
+            }
+            else {
                 return '';
             }
         }
@@ -268,7 +270,8 @@ 
                 if (!$ending) {
                     if (isset($this->tag_counts[$name])) {
                         $this->tag_counts[$name]++;
-                    } else {
+                    }
+                    else {
                         $this->tag_counts[$name] = 1;
                     }
                 }
@@ -276,7 +279,8 @@ 
                     $ending = ' /';
                 }
                 return '<'.$name.$params.$ending.'>';
-            } else {
+            }
+            else {
                 return '';
             }
         }
@@ -285,7 +289,8 @@ 
         if (preg_match("/^!--(.*)--$/si", $data)) {
             if ($this->strip_comments) {
                 return '';
-            } else {
+            }
+            else {
                 return '<'.$data.'>';
             }
         }
@@ -324,7 +329,9 @@ 
             while (1) {
                 $len = strlen($data);
                 $data = preg_replace("/<({$tags})(\s[^>]*)?(><\\/\\1>|\\/>)/", '', $data);
-                if ($len == strlen($data)) break;
+                if ($len == strlen($data)) {
+                    break;
+                }
             }
         }
 

classes/Db/Query.php

Braces +19 added lines, -10 removed lines

@@ -112,7 +112,8 @@ 
 
                 if (is_int($paramValue)) {
                     $paramType = \PDO::PARAM_INT;
-                } else {
+                }
+                else {
                     $paramType = \PDO::PARAM_STR;
                 }
 
@@ -121,7 +122,8 @@ 
 
             $pdoStatement->execute();
 
-        } else {
+        }
+        else {
             // Execute the raw query
             $pdoStatement = $this->conn->query($sql);
         }
@@ -131,13 +133,16 @@ 
             $this->error($this->conn->errorCode() . ': ' . $this->conn->errorInfo()[2]);
         }
 
-        if (!$this->success) return;
+        if (!$this->success) {
+            return;
+        }
 
         if ( (!$pdoStatement) or (empty($pdoStatement)) ) {
             // A failed query.
             $this->success = false;
 
-        } else {
+        }
+        else {
 
             // A successful SELECT, SHOW, EXPLAIN or DESCRIBE query.
             $this->success = true;
@@ -150,7 +155,8 @@ 
             // Sanity check that lastInsertId() is actually a number, otherwise panic
             if (is_numeric($this->conn->lastInsertId())) {
                 $this->insert_id = (int) $this->conn->lastInsertId();
-            } else {
+            }
+            else {
                 throw new Exception('Last connection ID was not numeric!');
             }
             $this->affected_rows = $pdoStatement->rowCount();
@@ -176,8 +182,9 @@ 
 
     // After SELECT.
     public function field($row_index, $column_name) {
-        if ($this->rows > 0)
-            return $this->data[$row_index][$column_name];
+        if ($this->rows > 0) {
+                    return $this->data[$row_index][$column_name];
+        }
         return "";
     }
 
@@ -188,8 +195,9 @@ 
 
     // After SELECT.
     public function row($row_index) {
-        if ($this->success && $this->rows > 0)
-            return $this->data[$row_index];
+        if ($this->success && $this->rows > 0) {
+                    return $this->data[$row_index];
+        }
         return array();
     }
 
@@ -212,7 +220,8 @@ 
                     if ($n == "email" || $n == "password" || $n == "postcode") {
                         // Don't want to risk this data being displayed on any page.
                         $html .= "<td>**MASKED**</td>";
-                    } else {
+                    }
+                    else {
                         $html .= "<td>" . _htmlentities($field) . "</td>";
                     }
                 }