okaufmann / laravel-web-money-manager-ex

WebApp/new_transaction.php

Braces +5 added lines, -10 removed lines

@@ -41,8 +41,7 @@ 
         {

             $TrEditNr = $_GET["TrEditNr"];

             $FlagNew = False;

-        }

-    else

+        } else

         {

             $TrEditNr = 0;

             $FlagNew = True;

@@ -63,8 +62,7 @@ 
             $TransactionAmount = "0";

             $TransactionNotes = "Empty";

             $TransactionSubmit = "Insert transaction";

-        }

-        else

+        } else

         {

             $resultarray = db_function::transaction_select_one($TrEditNr);

             $TransactionHeaderText = "Edit transcation";

@@ -97,8 +95,7 @@ 
                     if (costant::disable_payee() !== True)

                         {

                             design::input_payee($TransactionPayee);

-                        }

-                    else

+                        } else

                         {

                             design::input_hidden("Payee","Keine Auswahl");

                         }

@@ -106,8 +103,7 @@ 
                         {

                             design::input_category($TransactionCategory);

                             design::input_subcategory($TransactionSubCategory);

-                        }

-                    else

+                        } else

                         {

                             design::input_hidden("Category","Keine Auswahl");

                             design::input_hidden("SubCategory","Keine Auswahl");

@@ -131,8 +127,7 @@ 
                                 echo "var date_today = get_today();";

                                 echo "document.getElementById('Date').value=date_today;";

                             echo "</script>";  

-                        }

-                    else

+                        } else

                         {

                             design::input_hidden("TrEditedNr",$TrEditNr);

                             echo "<script type='text/javascript'>";

WebApp/insert.php

Braces +5 added lines, -10 removed lines

@@ -33,20 +33,16 @@ 
         $TrType = $_POST["Type"];

         $TrAccount = $_POST["Account"];

         if (isset($_POST["ToAccount"]))

-            {$TrToAccount = $_POST["ToAccount"];}

-            else

+            {$TrToAccount = $_POST["ToAccount"];} else

             {$TrToAccount = "None";}

         if (isset($_POST["Payee"]))

-            {$TrPayee = $_POST["Payee"];}

-            else

+            {$TrPayee = $_POST["Payee"];} else

             {$TrPayee = "None";}

         if (isset($_POST["Category"]))

-            {$TrCategory = $_POST["Category"];}

-            else

+            {$TrCategory = $_POST["Category"];} else

             {$TrCategory = "None";}

         if (isset($_POST["SubCategory"]))

-            {$TrSubCategory = $_POST["SubCategory"];}

-            else

+            {$TrSubCategory = $_POST["SubCategory"];} else

             {$TrSubCategory = "None";}

         $TrAmount = $_POST["Amount"];

         $TrNotes = $_POST["Notes"];

@@ -65,8 +61,7 @@ 
                 echo "<script type='text/javascript'>";

                     echo "location.href='show.php'";

                 echo "</script>";

-            }

-        else

+            } else

             {

                 $TrEditedNr = db_function::transaction_insert ($TrDate, $TrStatus, $TrType, $TrAccount, $TrToAccount, $TrPayee, $TrCategory, $TrSubCategory, $TrAmount, $TrNotes);

             }

WebApp/index.php

Braces +4 added lines, -8 removed lines

@@ -4,8 +4,7 @@ 
 if ($error !== "ok")

     {

         echo $error;

-    }

-else

+    } else

     {

         $upgrade_result = db_upgrade::upgrade_db();

         if ($upgrade_result == "update_done")

@@ -45,19 +44,16 @@ 
                 $_SESSION["login_string"] = hash("sha512", $password . $user_browser);

                 header("Location: landing.php");

                 

-            }

-            else

+            } else

             {

                 header("Location: index.php");

             }

         

-        }

-        else

+        } else

         {

             header("Location: index.php");

         }

-    }

-else

+    } else

 {

     ?>

     

WebApp/functions.php

Braces +24 added lines, -36 removed lines

@@ -33,8 +33,7 @@ 
                 for ($i = 0; $i < sizeof($StatusArrayDesc); $i++)

                 {

                     if ($StatusArrayDB[$i] == $TrStatusDefault)

-                        {echo "<option value = '${StatusArrayDB[$i]}' selected> ${StatusArrayDesc[$i]} </option>";}

-                    else

+                        {echo "<option value = '${StatusArrayDB[$i]}' selected> ${StatusArrayDesc[$i]} </option>";} else

                         {echo "<option value = '${StatusArrayDB[$i]}'> ${StatusArrayDesc[$i]} </option>";}

                 }

                 echo "</select>";

@@ -54,8 +53,7 @@ 
                 for ($i = 0; $i < sizeof($TypeArrayDesc); $i++)

                 {

                     if ($TypeArrayDesc[$i] == $TrTypeDefault)

-                        {echo "<option value='${TypeArrayDesc[$i]}' selected> ${TypeArrayDesc[$i]} </option>";}

-                    else

+                        {echo "<option value='${TypeArrayDesc[$i]}' selected> ${TypeArrayDesc[$i]} </option>";} else

                         {echo "<option value='${TypeArrayDesc[$i]}'> ${TypeArrayDesc[$i]} </option>";}

                 }

                 echo "</select>";

@@ -77,8 +75,7 @@ 
                 for ($i = 0; $i < sizeof($AccountArrayDesc); $i++)

                 {

                     if ($AccountArrayDesc[$i] == $TrAccountDefault)

-                        {echo "<option value=\"${AccountArrayDesc[$i]}\" selected> ${AccountArrayDesc[$i]} </option>";}

-                    else

+                        {echo "<option value=\"${AccountArrayDesc[$i]}\" selected> ${AccountArrayDesc[$i]} </option>";} else

                         {echo "<option value=\"${AccountArrayDesc[$i]}\"> ${AccountArrayDesc[$i]} </option>";}

                 }

                 echo "</select>";

@@ -99,8 +96,7 @@ 
                 for ($i = 0; $i < sizeof($ToAccountArrayDesc); $i++)

                 {

                     if ($ToAccountArrayDesc[$i] == $TrToAccountDefault)

-                        {echo "<option value=\"${ToAccountArrayDesc[$i]}\" selected> ${ToAccountArrayDesc[$i]} </option>";}

-                    else

+                        {echo "<option value=\"${ToAccountArrayDesc[$i]}\" selected> ${ToAccountArrayDesc[$i]} </option>";} else

                         {echo "<option value=\"${ToAccountArrayDesc[$i]}\"> ${ToAccountArrayDesc[$i]} </option>";}

                 }

                 echo "</select>";

@@ -175,8 +171,7 @@ 
                 if ($TrAmountDefault <> 0)

                     {

                         echo "<input id='Amount' type='number' name='Amount' class='form-control' placeholder='New transaction amount' min='0.01' step ='0.01' value='${TrAmountDefault}' required />";

-                    }

-                else

+                    } else

                     {

                         echo "<input id='Amount' type='number' name='Amount' class='form-control' placeholder='New transaction amount' min='0.01' step ='0.01' required />";

                     }

@@ -194,8 +189,7 @@ 
                 if ($TrNotesDefault <> "Empty")

                     {

                         echo "<textarea id='Notes' name='Notes' class='form-control' rows='5' placeholder='New transaction notes'>${TrNotesDefault}</textarea>";

-                    }

-                else

+                    } else

                     {

                         echo "<textarea id='Notes' name='Notes' class='form-control' rows='5' placeholder='New transaction notes'></textarea>";

                     }

@@ -284,8 +278,7 @@ 
                 for ($i = 0; $i < sizeof($AccountArrayDesc); $i++)

                 {

                     if ($AccountArrayDesc[$i] == $TrAccountDefault)

-                        {echo "<option selected> ${AccountArrayDesc[$i]} </option>";}

-                    else

+                        {echo "<option selected> ${AccountArrayDesc[$i]} </option>";} else

                         {echo "<option> ${AccountArrayDesc[$i]} </option>";}

                 }

                 echo "</select>";

@@ -362,8 +355,7 @@ 
                                         );");

                     $db -> exec     ("INSERT or IGNORE INTO Parameters VALUES ('Version','${const_app_version}');");

                     $db = null;

-                }

-            catch(PDOException $e)

+                } catch(PDOException $e)

                 {$error = $e->getMessage();}

             

             return $error;

@@ -828,8 +820,7 @@ 
                     $login_check = hash('sha512', $password . $user_browser);

                     if ($login_check !== $login_string)

                         {header("Location: index.php");}

-                }

-                else

+                } else

                 {header("Location: index.php");}

             }

         }

@@ -838,8 +829,7 @@ 
     public static function generate_guid()

         {

             if (function_exists('com_create_guid'))

-                {return com_create_guid();}

-            else

+                {return com_create_guid();} else

                 {

                     mt_srand((double)microtime()*10000);

                     $charid = strtoupper(md5(uniqid(rand(), true)));

@@ -913,8 +903,7 @@ 
                         }

                 }

             if ($start_db_version !== $app_version && db_function::db_version() == $app_version)

-                {return "update_done";}

-            else

+                {return "update_done";} else

                 {return "update_not_need";}

         }

         

@@ -1086,8 +1075,9 @@ 
                         if (strpos($entry,"Transaction_".$TrID) == 0 && strpos($entry,"Transaction_".$TrID) !== false)

                         {

                             $AttachNumb = substr($entry,strpos($entry,"Attach")+6,strpos($entry,".")-(strpos($entry,"Attach")+6));

-                            if ($AttachNumb > $LastAttachNum)

-                                $LastAttachNum = $AttachNumb;

+                            if ($AttachNumb > $LastAttachNum) {

+                                                            $LastAttachNum = $AttachNumb;

+                            }

                         }

                     }

                     closedir($handle);

@@ -1151,8 +1141,9 @@ 
     public static function delete_attachment_by_name($FileName)

         {

             $FullPath = costant::attachments_folder()."/".$FileName;

-            if (!empty($FileName) && file_exists($FullPath))

-                unlink($FullPath);

+            if (!empty($FileName) && file_exists($FullPath)) {

+                            unlink($FullPath);

+            }

         }

 }    

 

@@ -1225,8 +1216,7 @@ 
             {

                 global $disable_authentication;

                 if ($disable_authentication == "True")

-                    {return True;}

-                else

+                    {return True;} else

                     {return False;}

             }

         

@@ -1234,8 +1224,7 @@ 
             {

                 global $disable_payee;

                 if ($disable_payee == "True")

-                    {return True;}

-                else

+                    {return True;} else

                     {return False;}

             }

         

@@ -1243,20 +1232,19 @@ 
             {

                 global $disable_category;

                 if ($disable_category == "True")

-                    {return True;}

-                else

+                    {return True;} else

                     {return False;}

             }

             

         public static function current_page_url ()

             {

              $pageURL = 'http';

-             if (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on")

-                $pageURL .= "s";

+             if (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") {

+                             $pageURL .= "s";

+             }

              $pageURL .= "://";

              if ($_SERVER["SERVER_PORT"] != "80" && $_SERVER["SERVER_PORT"] != "443")

-                {$pageURL .= $_SERVER["SERVER_NAME"].":".$_SERVER["SERVER_PORT"].$_SERVER["REQUEST_URI"];}

-             else

+                {$pageURL .= $_SERVER["SERVER_NAME"].":".$_SERVER["SERVER_PORT"].$_SERVER["REQUEST_URI"];} else

                 {$pageURL .= $_SERVER["SERVER_NAME"].$_SERVER["REQUEST_URI"];}

              return $pageURL;

             }

WebApp/services.php

Braces +1 added lines, -2 removed lines

@@ -106,8 +106,7 @@
                 attachments::delete_group($deletegroup_array);

                 echo $operation_succeded;

             }

-    }

-else

+    } else

     {

         echo $wrong_guid;

     }

WebApp/settings.php

Braces +16 added lines, -32 removed lines

@@ -13,36 +13,30 @@ 
 if ($_SERVER["REQUEST_METHOD"] == "POST")

     {        

         if (isset ($_POST["Set_Disable_authentication"]))

-            {$disable_authentication = $_POST["Set_Disable_authentication"];}

-            else

+            {$disable_authentication = $_POST["Set_Disable_authentication"];} else

             {$disable_authentication = "False";}

         

         if (isset ($_POST["Set_Username"]))

-            {$username = $_POST["Set_Username"];}

-            else

+            {$username = $_POST["Set_Username"];} else

             {$username = "";}

         

         $default_account = $_POST["Default_Account"];

         

         if (isset ($_POST["Set_Disable_payee"]))

-            {$disable_payee = $_POST["Set_Disable_payee"];}

-            else

+            {$disable_payee = $_POST["Set_Disable_payee"];} else

             {$disable_payee = "False";}

         

         if (isset ($_POST["Set_Disable_category"]))

-            {$disable_category = $_POST["Set_Disable_category"];}

-            else

+            {$disable_category = $_POST["Set_Disable_category"];} else

             {$disable_category = "False";}

         

         $guid = $_POST["Set_Guid"];

         

         if (isset($_POST["Set_Password"]) && $_POST["Set_Password"] !== "" && $_POST["Set_Password"] !== Null)

-            {$password = hash("sha512", $_POST["Set_Password"]);}

-        else

+            {$password = hash("sha512", $_POST["Set_Password"]);} else

             {

                 if (isset ($_POST["Set_Disable_authentication"]))

-                    {$password = "";}

-                    else

+                    {$password = "";} else

                     {$password = costant::login_password();} 

             }

         

@@ -61,8 +55,7 @@ 
             {

                 various::update_configuration_file($parameterarray);

                 header("Location: landing.php");

-            }

-        else

+            } else

             {

                 various::update_configuration_file($parameterarray);

                 header("Location: guide.php");

@@ -95,8 +88,7 @@ 
     <div class="container">

         <?php

         if (isset($const_username) AND isset($const_password))

-            {echo "<h3 class='text_align_center'>Edit settings</h3>";}

-        else

+            {echo "<h3 class='text_align_center'>Edit settings</h3>";} else

                 {

                 echo "<br />";

                 echo "<p style='text-align:center'><img src='res\mmex.png' alt='Money Manager EX Logo' height='150' width='150' /></p>";

@@ -117,18 +109,15 @@ 
                 //SECTION AUTHENTICATION

                 design::section_legened("Authentication");

                     if ($const_disable_authentication == True)

-                        {design::settings_checkbox("Set_Disable_authentication",True,"Disable authentication (Not recommended)");}

-                        else

+                        {design::settings_checkbox("Set_Disable_authentication",True,"Disable authentication (Not recommended)");} else

                         {design::settings_checkbox("Set_Disable_authentication",False,"Disable authentication (Not recommended)");}

 

                     if (isset($const_username) && $const_disable_authentication == False)

-                        {design::settings("Username",$const_username,"","Text",True);}

-                        else

+                        {design::settings("Username",$const_username,"","Text",True);} else

                         {design::settings("Username","","Insert a new username","Text",True);}

                     

                     if (isset($const_password) && $const_disable_authentication == False)

-                        {design::settings_password("Password","To change insert a new password",False);}

-                        else

+                        {design::settings_password("Password","To change insert a new password",False);} else

                         {design::settings_password("Password","Insert a password",True);}

             

                     design::settings_password("Confirm_Password","Confirm new password",False);

@@ -137,26 +126,22 @@ 
                 //SECTION NEW TRANSACTIONS

                 design::section_legened("New transactions");

                     if ($const_disable_payee == True)

-                        {design::settings_checkbox("Set_Disable_payee",True,"Disable payees management");}

-                        else

+                        {design::settings_checkbox("Set_Disable_payee",True,"Disable payees management");} else

                         {design::settings_checkbox("Set_Disable_payee",False,"Disable payees management");}

                         

                     if ($const_disable_category == True)

-                        {design::settings_checkbox("Set_Disable_category",True,"Disable categories management");}

-                        else

+                        {design::settings_checkbox("Set_Disable_category",True,"Disable categories management");} else

                         {design::settings_checkbox("Set_Disable_category",False,"Disable categories management");}

                     

                     if (isset($const_defaultaccountname))

-                        {design::settings_default_account($const_defaultaccountname);}

-                        else

+                        {design::settings_default_account($const_defaultaccountname);} else

                         {design::settings_default_account("None");}

                 echo "<br />";

                 

                 //SECTION DESKTOP INTEGRATION

                 design::section_legened("Desktop integration");

                     if (isset($const_desktop_guid))

-                        {design::settings("Guid",$const_desktop_guid,"","Text",True);}

-                        else

+                        {design::settings("Guid",$const_desktop_guid,"","Text",True);} else

                         {design::settings("Guid",security::generate_guid(),"","Text",True);}

                 

             ?>

@@ -193,8 +178,7 @@ 
                         echo ("<button type='button' id='EditSettings' name='EditSettings' class='btn btn-lg btn-success btn-block' onclick='check_password_match_and_submit(\"Set_Password\",\"Set_Confirm_Password\",\"login\")'>Edit Settings</button>");

                         echo "<br />";

                         echo ("<a href='landing.php' class='btn btn-lg btn-success btn-block'>Return to menu</a>");

-                    }

-                else

+                    } else

                     {

                         echo ("<button type='button' id='EditSettings' name='EditSettings' class='btn btn-lg btn-success btn-block' onclick='check_password_match_and_submit(\"Set_Password\",\"Set_Confirm_Password\",\"login\")'>Apply Settings</button>");

                     }

WebApp/show.php

Braces +6 added lines, -4 removed lines

@@ -108,10 +108,12 @@
                                         //NOTES

                                         $TrNotesShow = $resultarray[$i]["Notes"];

                                         $NotesHTMLCode = "";

-                                        if ($TrNotesShow != "" && $TrNotesShow != "None")

-                                            $NotesHTMLCode .= "<span class='glyphicon glyphicon-info-sign' data-toggle='tooltip' title='${TrNotesShow}' id='tooltip_notes_${lineid}'></span> ";

-                                        if (attachments::get_number_of_attachments($lineid) > 0)

-                                            $NotesHTMLCode .= "<span class='glyphicon glyphicon-paperclip'></span>";

+                                        if ($TrNotesShow != "" && $TrNotesShow != "None") {

+                                                                                    $NotesHTMLCode .= "<span class='glyphicon glyphicon-info-sign' data-toggle='tooltip' title='${TrNotesShow}' id='tooltip_notes_${lineid}'></span> ";

+                                        }

+                                        if (attachments::get_number_of_attachments($lineid) > 0) {

+                                                                                    $NotesHTMLCode .= "<span class='glyphicon glyphicon-paperclip'></span>";

+                                        }

                                         design::table_cell($NotesHTMLCode,"text_align_center");

                                         

                                         //DELETE