eliareutlinger / minska-api

user/update/index.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
     $user->birthdate = $data->birthdate;
     $user->aims = $data->aims;
 
-    if($user->update()){
+    if ($user->update()) {
 
         $token = array(
             "iss" => $token_conf['issuer'],
@@ -63,7 +63,7 @@ 
                 returnError();
             }
 
-        } catch (Exception $e){
+        } catch (Exception $e) {
             returnForbidden($e);
         }
 

user/login/index.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 $user->email = $data->email;
 $email_exists = $user->emailExists();
 
-if($email_exists && password_verify($data->password, $user->password)){
+if ($email_exists && password_verify($data->password, $user->password)) {
 
     $token = array(
         "iss" => $token_conf['issuer'],

_config/objects/calorie.php

Spacing +14 added lines, -14 removed lines

@@ -12,11 +12,11 @@ 
     public $amount;
     public $date;
 
-    public function __construct($db){
+    public function __construct($db) {
         $this->conn = $db;
     }
 
-    public function readByDay($amount = false, $order = 'DESC'){
+    public function readByDay($amount = false, $order = 'DESC') {
 
         $query = "
         SELECT ID as id, Title as title, Calories as calories, Amount as amount
@@ -34,7 +34,7 @@ 
 
     }
 
-    public function readDays($order = 'DESC'){
+    public function readDays($order = 'DESC') {
 
         $query = "
         SELECT Date as date FROM ". $this->db_table . "
@@ -50,7 +50,7 @@ 
 
     }
 
-    public function create(){
+    public function create() {
 
         $query = "
         INSERT INTO " . $this->db_table . " SET
@@ -61,11 +61,11 @@ 
         Date = :date
         ";
 
-        $this->userid=htmlspecialchars(strip_tags($this->userid));
-        $this->title=htmlspecialchars(strip_tags($this->title));
-        $this->calories=htmlspecialchars(strip_tags($this->calories));
-        $this->amount=htmlspecialchars(strip_tags($this->amount));
-        $this->date=htmlspecialchars(strip_tags($this->date));
+        $this->userid = htmlspecialchars(strip_tags($this->userid));
+        $this->title = htmlspecialchars(strip_tags($this->title));
+        $this->calories = htmlspecialchars(strip_tags($this->calories));
+        $this->amount = htmlspecialchars(strip_tags($this->amount));
+        $this->date = htmlspecialchars(strip_tags($this->date));
 
         $stmt = $this->conn->prepare($query);
         $stmt->bindParam(":userid", $this->userid);
@@ -74,7 +74,7 @@ 
         $stmt->bindParam(":amount", $this->amount);
         $stmt->bindParam(":date", $this->date);
 
-        if($stmt->execute()){
+        if ($stmt->execute()) {
             $this->id = $this->conn->lastInsertId();
             return true;
         }
@@ -83,21 +83,21 @@ 
 
     }
 
-    public function delete(){
+    public function delete() {
 
         $query = "
         DELETE FROM " . $this->db_table . "
         WHERE ID = :id AND UserID = :userid
         ";
 
-        $this->id=htmlspecialchars(strip_tags($this->id));
-        $this->userid=htmlspecialchars(strip_tags($this->userid));
+        $this->id = htmlspecialchars(strip_tags($this->id));
+        $this->userid = htmlspecialchars(strip_tags($this->userid));
 
         $stmt = $this->conn->prepare($query);
         $stmt->bindParam(":id", $this->id);
         $stmt->bindParam(":userid", $this->userid);
 
-        if($stmt->execute()){
+        if ($stmt->execute()) {
 
             return true;
 

_config/objects/user.php

Spacing +24 added lines, -24 removed lines

@@ -17,11 +17,11 @@ 
     public $birthdate;
     public $aims;
 
-    public function __construct($db){
+    public function __construct($db) {
         $this->conn = $db;
     }
 
-    public function create(){
+    public function create() {
 
         $query = "
         INSERT INTO " . $this->db_table . " SET
@@ -32,27 +32,27 @@ 
 
         $stmt = $this->conn->prepare($query);
 
-        if(strlen($this->firstname) > 0 && strlen($this->lastname) > 0){
-            $this->firstname=htmlspecialchars(strip_tags($this->firstname));
-            $this->lastname=htmlspecialchars(strip_tags($this->lastname));
+        if (strlen($this->firstname)>0 && strlen($this->lastname)>0) {
+            $this->firstname = htmlspecialchars(strip_tags($this->firstname));
+            $this->lastname = htmlspecialchars(strip_tags($this->lastname));
         } else {
             throw new InvalidArgumentException('Invalid Firstname or Lastname');
         }
 
-        if($this->emailExists()){
+        if ($this->emailExists()) {
             throw new InvalidArgumentException('E-Mail already in use');
         }
 
-        if(filter_var($this->email, FILTER_VALIDATE_EMAIL)){
-            $this->email=htmlspecialchars(strip_tags($this->email));
+        if (filter_var($this->email, FILTER_VALIDATE_EMAIL)) {
+            $this->email = htmlspecialchars(strip_tags($this->email));
         } else {
             throw new InvalidArgumentException('Invalid E-Mail Adress');
         }
 
-        if (strlen($this->password) < 8 && !preg_match("#[0-9]+#", $this->password) && !preg_match("#[a-zA-Z]+#", $this->password)) {
+        if (strlen($this->password)<8 && !preg_match("#[0-9]+#", $this->password) && !preg_match("#[a-zA-Z]+#", $this->password)) {
             throw new InvalidArgumentException('Invalid Password');
         } else {
-            $this->password=htmlspecialchars(strip_tags($this->password));
+            $this->password = htmlspecialchars(strip_tags($this->password));
         }
 
         $stmt->bindParam(':firstname', $this->firstname);
@@ -62,7 +62,7 @@ 
         $password_hash = password_hash($this->password, PASSWORD_BCRYPT);
         $stmt->bindParam(':password', $password_hash);
 
-        if($stmt->execute()){
+        if ($stmt->execute()) {
             return true;
         }
 
@@ -70,7 +70,7 @@ 
 
     }
 
-    public function emailExists(){
+    public function emailExists() {
 
         $query = "
         SELECT ID, Firstname, Lastname, Email, Password, Language, IsFemale, Birthdate, Height, Aim_Weight, Aim_Date
@@ -79,12 +79,12 @@ 
         LIMIT 0,1
         ";
 
-        $this->email=htmlspecialchars(strip_tags($this->email));
+        $this->email = htmlspecialchars(strip_tags($this->email));
 
         $stmt = $this->conn->prepare($query);
         $stmt->bindParam(1, $this->email);
         $stmt->execute();
-        if($stmt->rowCount()>0){
+        if ($stmt->rowCount()>0) {
 
             $row = $stmt->fetch(PDO::FETCH_ASSOC);
             $this->id = $row['ID'];
@@ -107,7 +107,7 @@ 
 
     }
 
-    public function update(){
+    public function update() {
 
         $query = "
         UPDATE " . $this->db_table . " SET
@@ -123,14 +123,14 @@ 
         ";
 
         $stmt = $this->conn->prepare($query);
-        $this->firstname=htmlspecialchars(strip_tags($this->firstname));
-        $this->lastname=htmlspecialchars(strip_tags($this->lastname));
-        $this->language=htmlspecialchars(strip_tags($this->language));
-        $this->isFemale=htmlspecialchars(strip_tags($this->isFemale));
-        $this->birthdate=htmlspecialchars(strip_tags($this->birthdate));
-        $this->height=htmlspecialchars(strip_tags($this->height));
-        $this->aims->weight=htmlspecialchars(strip_tags($this->aims->weight));
-        $this->aims->date=htmlspecialchars(strip_tags($this->aims->date));
+        $this->firstname = htmlspecialchars(strip_tags($this->firstname));
+        $this->lastname = htmlspecialchars(strip_tags($this->lastname));
+        $this->language = htmlspecialchars(strip_tags($this->language));
+        $this->isFemale = htmlspecialchars(strip_tags($this->isFemale));
+        $this->birthdate = htmlspecialchars(strip_tags($this->birthdate));
+        $this->height = htmlspecialchars(strip_tags($this->height));
+        $this->aims->weight = htmlspecialchars(strip_tags($this->aims->weight));
+        $this->aims->date = htmlspecialchars(strip_tags($this->aims->date));
 
         $stmt->bindParam(':firstname', $this->firstname);
         $stmt->bindParam(':lastname', $this->lastname);
@@ -142,7 +142,7 @@ 
         $stmt->bindParam(':aim_date', $this->aims->date);
         $stmt->bindParam(':id', $this->id);
 
-        if($stmt->execute()){
+        if ($stmt->execute()) {
             return true;
         }
 

_config/objects/template.php

Spacing +15 added lines, -15 removed lines

@@ -12,19 +12,19 @@ 
     public $amount;
     public $image;
 
-    public function __construct($db){
+    public function __construct($db) {
         $this->conn = $db;
     }
 
-    public function read($amount = false, $order = 'DESC'){
+    public function read($amount = false, $order = 'DESC') {
 
         $query = "
         SELECT ID as id, Title as title, DefaultAmout as amount, Calories as calories, Image as image
         FROM ". $this->db_table . "
         WHERE UserID = :userid";
 
-        if($amount){
-            $query .= " LIMIT ". $amount;
+        if ($amount) {
+            $query .= " LIMIT " . $amount;
         }
 
         $stmt = $this->conn->prepare($query);
@@ -35,7 +35,7 @@ 
 
     }
 
-    public function create(){
+    public function create() {
 
         $query = "
             INSERT INTO " . $this->db_table . " SET
@@ -46,11 +46,11 @@ 
             Image = :image
         ";
 
-        $this->userid=htmlspecialchars(strip_tags($this->userid));
-        $this->title=htmlspecialchars(strip_tags($this->title));
-        $this->calories=htmlspecialchars(strip_tags($this->calories));
-        $this->amount=htmlspecialchars(strip_tags($this->amount));
-        $this->image=htmlspecialchars(strip_tags($this->image));
+        $this->userid = htmlspecialchars(strip_tags($this->userid));
+        $this->title = htmlspecialchars(strip_tags($this->title));
+        $this->calories = htmlspecialchars(strip_tags($this->calories));
+        $this->amount = htmlspecialchars(strip_tags($this->amount));
+        $this->image = htmlspecialchars(strip_tags($this->image));
 
         $stmt = $this->conn->prepare($query);
         $stmt->bindParam(":userid", $this->userid);
@@ -59,7 +59,7 @@ 
         $stmt->bindParam(":calories", $this->calories);
         $stmt->bindParam(":image", $this->image);
 
-        if($stmt->execute()){
+        if ($stmt->execute()) {
             $this->id = $this->conn->lastInsertId();
             return true;
         }
@@ -68,21 +68,21 @@ 
 
     }
 
-    public function delete(){
+    public function delete() {
 
         $query = "
         DELETE FROM " . $this->db_table . "
         WHERE ID = :id AND UserID = :userid
         ";
 
-        $this->id=htmlspecialchars(strip_tags($this->id));
-        $this->userid=htmlspecialchars(strip_tags($this->userid));
+        $this->id = htmlspecialchars(strip_tags($this->id));
+        $this->userid = htmlspecialchars(strip_tags($this->userid));
 
         $stmt = $this->conn->prepare($query);
         $stmt->bindParam(":id", $this->id);
         $stmt->bindParam(":userid", $this->userid);
 
-        if($stmt->execute()){
+        if ($stmt->execute()) {
 
             return true;
 

_config/objects/weight.php

Spacing +13 added lines, -13 removed lines

@@ -10,11 +10,11 @@ 
     public $weight;
     public $measuredate;
 
-    public function __construct($db){
+    public function __construct($db) {
         $this->conn = $db;
     }
 
-    public function read($amount = false, $order = 'DESC'){
+    public function read($amount = false, $order = 'DESC') {
 
         $query = "
         SELECT ID as id, Weight as weight, MeasureDate as measuredate, CreationDate as creationdate
@@ -22,8 +22,8 @@ 
         WHERE UserID = :userid
         ORDER BY CreationDate ". $order;
 
-        if($amount){
-            $query .= " LIMIT ". $amount;
+        if ($amount) {
+            $query .= " LIMIT " . $amount;
         }
 
         $stmt = $this->conn->prepare($query);
@@ -34,7 +34,7 @@ 
 
     }
 
-    public function create(){
+    public function create() {
 
         $query = "
             INSERT INTO " . $this->db_table . " SET
@@ -43,9 +43,9 @@ 
             MeasureDate = :measuredate
         ";
 
-        $this->userid=htmlspecialchars(strip_tags($this->userid));
-        $this->weight=htmlspecialchars(strip_tags($this->weight));
-        $this->measuredate=htmlspecialchars(strip_tags($this->measuredate));
+        $this->userid = htmlspecialchars(strip_tags($this->userid));
+        $this->weight = htmlspecialchars(strip_tags($this->weight));
+        $this->measuredate = htmlspecialchars(strip_tags($this->measuredate));
 
         $stmt = $this->conn->prepare($query);
         $stmt->bindParam(":userid", $this->userid);
@@ -53,7 +53,7 @@ 
         $stmt->bindParam(":measuredate", $this->measuredate);
 
 
-        if($stmt->execute()){
+        if ($stmt->execute()) {
             $this->id = $this->conn->lastInsertId();
             return true;
         }
@@ -62,22 +62,22 @@ 
 
     }
 
-    public function delete(){
+    public function delete() {
 
         $query = "
         DELETE FROM " . $this->db_table . "
         WHERE ID = :id AND UserID = :userid
         ";
 
-        $this->id=htmlspecialchars(strip_tags($this->id));
-        $this->userid=htmlspecialchars(strip_tags($this->userid));
+        $this->id = htmlspecialchars(strip_tags($this->id));
+        $this->userid = htmlspecialchars(strip_tags($this->userid));
 
         $stmt = $this->conn->prepare($query);
         $stmt->bindParam(":id", $this->id);
         $stmt->bindParam(":userid", $this->userid);
 
 
-        if($stmt->execute()){
+        if ($stmt->execute()) {
 
             return true;
 

template/delete/index.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
         returnError($e);
     }
 
-} catch(Exception $e) {
+} catch (Exception $e) {
     returnForbidden($e);
 }
 

template/create/index.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
         returnError($e);
     }
 
-} catch(Exception $e) {
+} catch (Exception $e) {
     returnForbidden($e);
 }
 

calorie/create/index.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
         returnError($e);
     }
 
-} catch(Exception $e) {
+} catch (Exception $e) {
     returnForbidden($e);
 }