Merge branch 'attachments'

Conflicts:
	WebApp/services.php

.gitignore

@@ -1,2 +1,3 @@
 MMEX_New_Transaction.db
 configuration_user.php
+/WebApp/attachments/Transaction*.*

WebApp/about.php

@@ -13,8 +13,8 @@
         <title>Money Manager EX</title>
         <link rel="icon" href="res/favicon.ico" />
 
-        <link rel="stylesheet" type="text/css" href="res/bootstrap-3.1.1.min.css" />
-        <link rel="stylesheet" type="text/css" href="res/bootstrap-theme-3.1.1.min.css" />
+        <link rel="stylesheet" type="text/css" href="res/bootstrap-3.2.0.min.css" />
+        <link rel="stylesheet" type="text/css" href="res/bootstrap-theme-3.2.0.min.css" />
         <link rel="stylesheet" type="text/css" href="res/style_global-0.9.9.css" />
     </head>
 

WebApp/attachments.php

@@ -0,0 +1,43 @@
+<?php
+require_once "functions.php";
+session_start();
+security::redirect_if_not_loggedin();
+
+$Guid = costant::desktop_guid();
+
+if (isset($_GET["DeleteAttach"]))
+    {
+        attachments::delete_attachment_by_name($_GET["DeleteAttach"]);
+    }
+
+if (isset($_FILES['UploadedAttachments']) && isset($_POST["Attachment_TrId"]))
+    {
+        $TrNumber = (int)$_POST['Attachment_TrId'];
+        $FileName = $_FILES['UploadedAttachments']['name'];
+        $FileExtension = substr($FileName,strpos($FileName,".")+1,strlen($FileName));
+        $NewFileName = "Transaction_".$TrNumber."_Attach".(attachments::get_number_of_attachments($TrNumber)+1).".".$FileExtension;
+        move_uploaded_file ($_FILES['UploadedAttachments']['tmp_name'], "attachments/".$NewFileName);
+        echo $NewFileName;
+    }
+
+if (isset($_GET["AttachmentsTable"]))
+    {
+        $TrId = $_GET["AttachmentsTable"];
+        $Attachments = attachments::get_attachments_filename_array($TrId,true);
+        echo "<table class = 'table'>";
+            echo "<tbody>";
+                for ($i = 0; $i < sizeof($Attachments); $i++)
+                {
+                    echo "<tr>";
+                        $File = $Attachments[$i];
+                        design::table_cell(substr($File,strpos($File,"Attach"),strlen($File)),"");
+                        design::table_cell("<a href='services.php?guid=${Guid}&download_attachment=${File}'>
+                            <span class='glyphicon glyphicon-download-alt'> </span> Open</a>","text_align_right");
+                        design::table_cell("<a href='#' onclick='attachment_delete(\"${File}\",${TrId});return false;'>
+                            <span class='glyphicon glyphicon-remove'> </span> Delete</a>","text_align_right");
+                    echo "</tr>";
+                }
+            echo "</tbody>";
+        echo "</table>";
+    }
+?>

WebApp/attachments/Readme.txt

@@ -0,0 +1 @@
+Folder for attachments. Do not delete!

WebApp/attachments/htaccess.txt

@@ -0,0 +1,10 @@
+#######################################
+## htaccess for block important file ##
+#######################################
+
+# Block folder list
+Options All -Indexes
+
+# Block entire folder
+Order deny,allow
+Deny from all

WebApp/configuration_system.php

@@ -4,8 +4,9 @@
 ##         don't touch              ##
 ######################################
 $dbpath = "MMEX_New_Transaction.db";
-$app_version = "1.0.0";
-$api_version = "0.9.9";
+$app_version = "1.0.1";
+$api_version = "1.0.1";
 $tr_default_status = "R";
 $tr_default_type = "Withdrawal";
+$attachments_folder = "attachments";
 ?>

WebApp/error.php

@@ -13,8 +13,8 @@
         <title>Money Manager EX</title>
         <link rel="icon" href="res/favicon.ico" />
 
-        <link rel="stylesheet" type="text/css" href="res/bootstrap-3.1.1.min.css" />
-        <link rel="stylesheet" type="text/css" href="res/bootstrap-theme-3.1.1.min.css" />
+        <link rel="stylesheet" type="text/css" href="res/bootstrap-3.2.0.min.css" />
+        <link rel="stylesheet" type="text/css" href="res/bootstrap-theme-3.2.0.min.css" />
         <link rel="stylesheet" type="text/css" href="res/style_global-0.9.9.css" />
     </head>