Merge remote-tracking branch 'origin/develop'

kimai · Sep 28, 2019 · 5287568 · 5287568
2 parents b2e7368 + 0f16af9
commit 5287568
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 53 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/core/processor.php b/core/processor.php
@@ -27,7 +27,7 @@
 
 $isCoreProcessor = 1;
 $dir_templates = 'templates/core/';
-require('../includes/kspi.php');
+require '../includes/kspi.php';
 
 $kga = Kimai_Registry::getConfig();
 $database = Kimai_Registry::getDatabase();

diff --git a/extensions/ki_timesheets/processor.php b/extensions/ki_timesheets/processor.php
@@ -577,7 +577,7 @@ function($activity) {
         }
 
         if (!$validateTime->isValid($_REQUEST['start_time'])) {
-            $_REQUEST['start_time'] = $_REQUEST['start_time'] . ':00';
+            $_REQUEST['start_time'] .= ':00';
             if (!$validateTime->isValid($_REQUEST['start_time'])) {
                 $errors['start_time'] = $kga['lang']['TimeDateInputError'];
             }
@@ -588,7 +588,7 @@ function($activity) {
         }
 
         if ($_REQUEST['end_time'] != '' && !$validateTime->isValid($_REQUEST['end_time'])) {
-            $_REQUEST['end_time'] = $_REQUEST['end_time'] . ':00';
+            $_REQUEST['end_time'] .= ':00';
             if (!$validateTime->isValid($_REQUEST['end_time'])) {
                 $errors['end_time'] = $kga['lang']['TimeDateInputError'];
             }
@@ -623,10 +623,17 @@ function($activity) {
             $outDate = null;
         }
 
-        $data['start'] = $inDate->getTimestamp();
+        $rounded = Kimai_Rounding::roundTimespan(
+            $inDate->getTimestamp(),
+            $outDate->getTimestamp(),
+            $kga->getRoundPrecisionRecorderTimes(),
+            $kga->isRoundDownRecorderTimes()
+        );
+
+        $data['start'] = $rounded['start'];
 
-        if ($outDate != null) {
-            $data['end'] = $outDate->getTimestamp();
+        if ($outDate !== null) {
+            $data['end'] = $rounded['end'];
             $data['duration'] = $data['end'] - $data['start'];
         }
 
@@ -637,7 +644,7 @@ function($activity) {
             }
 
             // TIME RIGHT - EDIT ENTRY
-            Kimai_Logger::logfile("timeEntry_edit: " . $id);
+            Kimai_Logger::logfile('timeEntry_edit: ' . $id);
             $database->timeEntry_edit($id, $data);
         } else {
             // TIME RIGHT - NEW ENTRY
@@ -653,7 +660,7 @@ function($activity) {
                     break 2;
                 }
 
-                Kimai_Logger::logfile("timeEntry_create");
+                Kimai_Logger::logfile('timeEntry_create');
                 $createdId = $database->timeEntry_create($data);
                 if (!$createdId) {
                     $errors[''] = $kga['lang']['error'];

diff --git a/libraries/Kimai/Invoice/HtmlToPdfRenderer.php b/libraries/Kimai/Invoice/HtmlToPdfRenderer.php
@@ -24,7 +24,6 @@
  */
 class Kimai_Invoice_HtmlToPdfRenderer extends Kimai_Invoice_HtmlRenderer
 {
-
     /**
      * Render the invoice.
      */

diff --git a/libraries/Kimai/Invoice/OdtRenderer.php b/libraries/Kimai/Invoice/OdtRenderer.php
@@ -24,7 +24,6 @@
  */
 class Kimai_Invoice_OdtRenderer extends Kimai_Invoice_AbstractRenderer
 {
-
     /**
      * Render the invoice.
      *
@@ -38,22 +37,22 @@ public function render()
         if (class_exists('ZipArchive')) {
             $doc->setZipMethod('ziparchive');
         } else {
-            $doc->setZipMethod('shell');
+            $doc->setZipMethod();
             try {
-                $doc->setZipBinary('zip');
-                $doc->setUnzipBinary('unzip');
+                $doc->setZipBinary();
+                $doc->setUnzipBinary();
             } catch (tinyDocException $e) {
                 $doc->setZipMethod('pclzip');
             }
         }
 
         $doc->setProcessDir($this->getTemporaryDirectory());
 
-        //This is where the template is selected
+        // This is where the template is selected
 
         $templateForm = $this->getTemplateDir() . $this->getTemplateFile();
         $doc->createFrom($templateForm);
-        $doc->loadXml('content.xml');
+        $doc->loadXml();
 
         // fetch variables from model to get values
         $customer = $this->getModel()->getCustomer();

diff --git a/libraries/Kimai/Invoice/PrintModel.php b/libraries/Kimai/Invoice/PrintModel.php
@@ -24,7 +24,6 @@
  */
 class Kimai_Invoice_PrintModel
 {
-
     /**
      * @var array
      */