Merged branch 'master' of https://github.com/fguillot/kanboard

only imports conflicted

3 files changed, 49 insertions, 1 deletions

diff --git a/app/Helper/Board.php b/app/Helper/Board.php
new file mode 100644
index 00000000..452a3b70
--- /dev/null
+++ b/app/Helper/Board.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Helper;
+
+/**
+ * Board Helper
+ *
+ * @package helper
+ * @author  Frederic Guillot
+ */
+class Board extends \Core\Base
+{
+    /**
+     * Return true if tasks are collapsed
+     *
+     * @access public
+     * @param  integer   $project_id
+     * @return boolean
+     */
+    public function isCollapsed($project_id)
+    {
+        return $this->userSession->isBoardCollapsed($project_id);
+    }
+}
diff --git a/app/Helper/Datetime.php b/app/Helper/Dt.php
index 74ea9bdd..b338fdc8 100644
--- a/app/Helper/Datetime.php
+++ b/app/Helper/Dt.php
@@ -2,15 +2,35 @@
 
 namespace Helper;
 
+use DateTime;
+
 /**
  * DateTime helpers
  *
  * @package helper
  * @author  Frederic Guillot
  */
-class Datetime extends \Core\Base
+class Dt extends \Core\Base
 {
     /**
+     * Get duration in seconds into human format
+     *
+     * @access public
+     * @param  integer  $seconds
+     * @return string
+     */
+    public function duration($seconds)
+    {
+        if ($seconds == 0) {
+            return 0;
+        }
+
+        $dtF = new DateTime("@0");
+        $dtT = new DateTime("@$seconds");
+        return $dtF->diff($dtT)->format('%a days, %h hours, %i minutes and %s seconds');
+    }
+
+    /**
      * Get the age of an item in quasi human readable format.
      * It's in this format: <1h , NNh, NNd
      *
diff --git a/app/Helper/Url.php b/app/Helper/Url.php
index e133f195..8de63f8d 100644
--- a/app/Helper/Url.php
+++ b/app/Helper/Url.php
@@ -99,6 +99,10 @@ class Url extends \Core\Base
      */
     public function server()
     {
+        if (empty($_SERVER['SERVER_NAME'])) {
+            return 'http://localhost/';
+        }
+
         $self = str_replace('\\', '/', dirname($_SERVER['PHP_SELF']));
 
         $url = Request::isHTTPS() ? 'https://' : 'http://';