More progress with attachments.

diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index aad91e9..af470c7 100644 (file)
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -52,6 +52,8 @@ class ttFileHelper {
   // checkSiteRegistration - obtains site id and key from local database.
   // If not found, it tries to register with file stroage facility.
   function checkSiteRegistration() {
+
+    global $i18n;
     $mdb2 = getConnection();
 
     // Obtain site id.
@@ -94,6 +96,8 @@ class ttFileHelper {
           $mdb2->exec($sql);
           $sql = "insert into tt_site_config values('locker_key', $key, now(), null)";
           $mdb2->exec($sql);
+        } else {
+          $this->errors->add($i18n->get('error.file_storage'));
         }
       }
     } else {
@@ -109,16 +113,21 @@ class ttFileHelper {
   }
 
   // putFile - puts uploaded file in remote storage.
-  function putFile($description) {
-
-    $url = $this->storage_uri;
-    $fields = array('description' => urlencode($description),
-//     'fname' => urlencode($_POST['first_name']),
-//     'title' => urlencode($_POST['title']),
-//     'company' => urlencode($_POST['institution']),
-//     'age' => urlencode($_POST['age']),
-//     'email' => urlencode($_POST['email']),
-//     'phone' => urlencode($_POST['phone'])
+  function putFile($fields) {
+    $mdb2 = getConnection();
+
+    $fields = array('site_id' => urlencode($this->site_id),
+      'site_key' => urlencode($this->site_key),
+      //'org_id' => urlencode($this->org_id),       // TODO: obtain this properly.
+      //'org_key' => urlencode($this->org_key),     // TODO: obtain this properly.
+      //'group_id' => urlencode($this->group_id),   // TODO: obtain this properly.
+      //'group_key' => urlencode($this->group_key), // TODO: obtain this properly.
+      //'user_id' => urlencode($this->user_id),     // TODO: obtain this properly.
+      //'user_key' => urlencode($this->user_key),   // TODO: obtain this properly.
+      'file_name' => urlencode($fields['file_name']),
+      'description' => urlencode($fields['description']),
+      // TODO: add file content here, too. Will this work for large files?
+      //
     );
 
     // url-ify the data for the POST.
@@ -129,7 +138,7 @@ class ttFileHelper {
     $ch = curl_init();
 
     // Set the url, number of POST vars, POST data.
-    curl_setopt($ch, CURLOPT_URL, $url);
+    curl_setopt($ch, CURLOPT_URL, $this->putfile_uri);
     curl_setopt($ch, CURLOPT_POST, count($fields));
     curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -142,7 +151,8 @@ class ttFileHelper {
 
     if ($result) {
       $result_array = json_decode($result, true);
-      $file_id = $mdb2->quote($result_array['id']);
+      $file_id = $result_array['file_id'];
+      $file_key = $result_array['file_key'];
     }
 
     unlink($_FILES['newfile']['tmp_name']);

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 59ea97e..06a28c8 100644 (file)
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -120,6 +120,7 @@ $i18n_key_words = array(
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 96f1776..97ab7e6 100644 (file)
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -122,6 +122,7 @@ $i18n_key_words = array(
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 7a6ef81..403289b 100644 (file)
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -116,6 +116,7 @@ $i18n_key_words = array(
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index bc7ba0c..980706d 100644 (file)
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -110,6 +110,7 @@ $i18n_key_words = array(
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 8dc2011..f1fc72a 100644 (file)
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -105,6 +105,7 @@ $i18n_key_words = array(
 'error.format' => 'Invalid file format.',
 'error.user_count' => 'Limit on user count.',
 'error.expired' => 'Expiration date reached.',
+'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 'warn.sure' => 'Are you sure?',

diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 7978ff5..4f33f6d 100644 (file)
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -118,6 +118,7 @@ $i18n_key_words = array(
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 94fb496..f46db01 100644 (file)
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -126,6 +126,8 @@ $i18n_key_words = array(
 'error.format' => 'Faili formaat on vale.',
 'error.user_count' => 'Kasutajate arvu piirang.',
 'error.expired' => 'Kehtivusaeg on lõppenud.',
+// TODO: translate the following.
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 'warn.sure' => 'Oled kindel?',

diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 17a7617..8111b3d 100644 (file)
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -123,6 +123,8 @@ $i18n_key_words = array(
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// TODO: translate the following.
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 661edd8..2f3a409 100644 (file)
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -118,6 +118,7 @@ $i18n_key_words = array(
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index b797b6f..1bb5f68 100644 (file)
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -116,6 +116,7 @@ $i18n_key_words = array(
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index a69e6aa..bb2a334 100644 (file)
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -111,6 +111,7 @@ $i18n_key_words = array(
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 8cc4d02..19ace04 100644 (file)
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -133,6 +133,7 @@ $i18n_key_words = array(
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 8c2e730..349c224 100644 (file)
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -121,6 +121,7 @@ $i18n_key_words = array(
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index c1a87b7..c19f9f3 100644 (file)
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -115,6 +115,7 @@ $i18n_key_words = array(
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 3b48408..c53b8ae 100644 (file)
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -124,6 +124,7 @@ $i18n_key_words = array(
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 1a77cde..cf3f608 100644 (file)
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -123,6 +123,7 @@ $i18n_key_words = array(
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 426a142..e56846c 100644 (file)
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -105,6 +105,8 @@ $i18n_key_words = array(
 'error.format' => 'Bestandsformaat niet valide.',
 'error.user_count' => 'Limiet op aantal gebruikers.',
 'error.expired' => 'Verloop datum is bereikt.',
+// TODO: translate the following.
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 'warn.sure' => 'Ben je er zeker van?',

diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index a37e888..e681635 100644 (file)
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -124,6 +124,7 @@ $i18n_key_words = array(
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 9258b85..e81fc25 100644 (file)
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -120,6 +120,7 @@ $i18n_key_words = array(
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 99d4d1c..f5d9239 100644 (file)
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -117,6 +117,7 @@ $i18n_key_words = array(
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 8969cdc..a0ac39b 100644 (file)
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -117,6 +117,7 @@ $i18n_key_words = array(
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 74b843e..83218b0 100644 (file)
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -124,6 +124,7 @@ $i18n_key_words = array(
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index c8dee6f..36815e9 100644 (file)
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -104,6 +104,7 @@ $i18n_key_words = array(
 'error.format' => 'Неверный формат файла.',
 'error.user_count' => 'Ограничение на количество пользователей.',
 'error.expired' => 'Достигнута дата экспирации.',
+'error.file_storage' => 'Ошибка файлохранилища.',
 
 // Warning messages.
 'warn.sure' => 'Вы уверены?',

diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 34d92dd..1a53dc8 100644 (file)
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -122,6 +122,7 @@ $i18n_key_words = array(
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index a4cc8fe..c9144c8 100644 (file)
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -114,6 +114,7 @@ $i18n_key_words = array(
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 7178d54..6365d1c 100644 (file)
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -117,6 +117,7 @@ $i18n_key_words = array(
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 818a7db..c89dd64 100644 (file)
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -115,6 +115,7 @@ $i18n_key_words = array(
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 7608d15..fd96a2a 100644 (file)
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -127,6 +127,7 @@ $i18n_key_words = array(
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index ef133c9..8d56183 100644 (file)
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -116,6 +116,7 @@ $i18n_key_words = array(
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 9aa1245..dc590fe 100644 (file)
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -121,6 +121,7 @@ $i18n_key_words = array(
 // 'error.format' => 'Invalid file format.',
 // 'error.user_count' => 'Limit on user count.',
 // 'error.expired' => 'Expiration date reached.',
+// 'error.file_storage' => 'File storage error.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1dcec80..9f0efd9 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
-          <td align="center">&nbsp;Anuko Time Tracker 1.18.59.4874 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.18.59.4875 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

diff --git a/project_files.php b/project_files.php
index affc6d7..fec090b 100644 (file)
--- a/project_files.php
+++ b/project_files.php
@@ -72,7 +72,10 @@ if ($request->isPost()) {
 
   if ($err->no()) {
     $fileHelper = new ttFileHelper($err);
-    $fileHelper->putFile($cl_description);
+    $fields = array('description'=>$cl_description); // TODO: add other fields here if required.
+    if (!$fileHelper->putFile($fields)) {
+      $err->add($i18n->get('error.expired'));
+    }
   }
 //  if ($err->no()) $msg->add($i18n->get('form.import.success'));
 } // isPost