Merge remote-tracking branch 'origin/master'

[jirafeau_project.git] / lib / functions.js.php

diff --git a/lib/functions.js.php b/lib/functions.js.php
index 24be13fe429bfd06e74cf29d2bcbb4a508b41642..7a1c5af373dc17691f2981f7e9f245be4477b629 100644 (file)
--- a/lib/functions.js.php
+++ b/lib/functions.js.php
@@ -18,6 +18,8 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 

+header('Content-Type: text/javascript');
+

 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/../');
 require (JIRAFEAU_ROOT . 'lib/config.original.php');
 require (JIRAFEAU_ROOT . 'lib/settings.php');
 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/../');
 require (JIRAFEAU_ROOT . 'lib/config.original.php');
 require (JIRAFEAU_ROOT . 'lib/settings.php');


@@ -204,7 +206,7 @@ function add_time_string_to_date(d, time)
     {
         return false;
     }
     {
         return false;
     }

-    
+

     if (time == 'minute')
     {
         d.setSeconds (d.getSeconds() + 60);
     if (time == 'minute')
     {
         d.setSeconds (d.getSeconds() + 60);


@@ -230,6 +232,11 @@ function add_time_string_to_date(d, time)
         d.setSeconds (d.getSeconds() + 2419200);
         return true;
     }
         d.setSeconds (d.getSeconds() + 2419200);
         return true;
     }

+    if (time == 'quarter')
+    {
+        d.setSeconds (d.getSeconds() + 7257600);
+        return true;
+    }

     if (time == 'year')
     {
         d.setSeconds (d.getSeconds() + 29030400);
     if (time == 'year')
     {
         d.setSeconds (d.getSeconds() + 29030400);