Kolab Groupware OBS

kolab-hkccp.spec Changed

0001-Fix-missing-Hosting-tab-after-2FA-logon-of-group-acc.patch Deleted

@@ -1,48 +0,0 @@
-From 34fa825d630b7c10f78f24bb4069c2fdcaaa48c1 Mon Sep 17 00:00:00 2001
-From: Aleksander Machniak <machniak@kolabsys.com>
-Date: Fri, 17 Nov 2017 20:23:32 +0100
-Subject: [PATCH] Fix missing Hosting tab after 2FA logon of group account
- admin (Bifrost#T59208)
-
----
- lib/Kolab/Hosted/Controller/Auth2F.php | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/lib/Kolab/Hosted/Controller/Auth2F.php b/lib/Kolab/Hosted/Controller/Auth2F.php
-index 5738841..55294c8 100644
---- a/lib/Kolab/Hosted/Controller/Auth2F.php
-+++ b/lib/Kolab/Hosted/Controller/Auth2F.php
-@@ -25,6 +25,7 @@
- 
- namespace Kolab\Hosted\Controller;
- 
-+use Kolab\API;
- use Kolab\Log;
- use Kolab\Utils;
- use Kolab\Hosted\Config;
-@@ -82,6 +83,7 @@ class Auth2F
-         $_SESSION['2fa_factors']  = $factors;
-         $_SESSION['2fa_username'] = $this->username;
-         $_SESSION['2fa_account']  = $user;
-+        $_SESSION['2fa_apitoken'] = API\Client::get_user_instance()->get_session_token();
- 
-         // define login form
-         $nonce   = $_SESSION['2fa_nonce'];
-@@ -151,11 +153,13 @@ class Auth2F
-             return;
-         }
- 
-+        // setup user session
-         $user = $_SESSION['2fa_account'];
-+        API\Client::get_user_instance()->set_session_token($_SESSION['2fa_apitoken']);
- 
-         // clean up
-         unset($_SESSION['2fa_time'], $_SESSION['2fa_nonce'], $_SESSION['2fa_factors'],
--            $_SESSION['2fa_username'], $_SESSION['2fa_account']);
-+            $_SESSION['2fa_username'], $_SESSION['2fa_account'], $_SESSION['2fa_apitoken']);
- 
-         return $user;
-     }
--- 
-2.14.3
-

kolab-hkccp-0.7.21.tar.gz/0001-Fix-missing-Hosting-tab-after-2FA-logon-of-group-acc.patch Added

@@ -0,0 +1,48 @@
+From 34fa825d630b7c10f78f24bb4069c2fdcaaa48c1 Mon Sep 17 00:00:00 2001
+From: Aleksander Machniak <machniak@kolabsys.com>
+Date: Fri, 17 Nov 2017 20:23:32 +0100
+Subject: [PATCH] Fix missing Hosting tab after 2FA logon of group account
+ admin (Bifrost#T59208)
+
+---
+ lib/Kolab/Hosted/Controller/Auth2F.php | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/lib/Kolab/Hosted/Controller/Auth2F.php b/lib/Kolab/Hosted/Controller/Auth2F.php
+index 5738841..55294c8 100644
+--- a/lib/Kolab/Hosted/Controller/Auth2F.php
++++ b/lib/Kolab/Hosted/Controller/Auth2F.php
+@@ -25,6 +25,7 @@
+ 
+ namespace Kolab\Hosted\Controller;
+ 
++use Kolab\API;
+ use Kolab\Log;
+ use Kolab\Utils;
+ use Kolab\Hosted\Config;
+@@ -82,6 +83,7 @@ class Auth2F
+         $_SESSION['2fa_factors']  = $factors;
+         $_SESSION['2fa_username'] = $this->username;
+         $_SESSION['2fa_account']  = $user;
++        $_SESSION['2fa_apitoken'] = API\Client::get_user_instance()->get_session_token();
+ 
+         // define login form
+         $nonce   = $_SESSION['2fa_nonce'];
+@@ -151,11 +153,13 @@ class Auth2F
+             return;
+         }
+ 
++        // setup user session
+         $user = $_SESSION['2fa_account'];
++        API\Client::get_user_instance()->set_session_token($_SESSION['2fa_apitoken']);
+ 
+         // clean up
+         unset($_SESSION['2fa_time'], $_SESSION['2fa_nonce'], $_SESSION['2fa_factors'],
+-            $_SESSION['2fa_username'], $_SESSION['2fa_account']);
++            $_SESSION['2fa_username'], $_SESSION['2fa_account'], $_SESSION['2fa_apitoken']);
+ 
+         return $user;
+     }
+-- 
+2.14.3
+

kolab-hkccp-0.7.20.tar.gz/composer.phar -> kolab-hkccp-0.7.21.tar.gz/composer.phar Changed

kolab-hkccp-0.7.20.tar.gz/config/config.ini.sample -> kolab-hkccp-0.7.21.tar.gz/config/config.ini.sample Changed

kolab-hkccp-0.7.20.tar.gz/lib/Kolab/API/Client.php -> kolab-hkccp-0.7.21.tar.gz/lib/Kolab/API/Client.php Changed

kolab-hkccp-0.7.20.tar.gz/lib/Kolab/Hosted/Controller/Auth2F.php -> kolab-hkccp-0.7.21.tar.gz/lib/Kolab/Hosted/Controller/Auth2F.php Changed

kolab-hkccp-0.7.20.tar.gz/lib/Kolab/Hosted/Controller/BackendController.php -> kolab-hkccp-0.7.21.tar.gz/lib/Kolab/Hosted/Controller/BackendController.php Changed

@@ -292,6 +292,7 @@
 
         // read configuration
         $suspend_after = $this->config->get('invoicing.suspend_after', 30);
+        $suspend_vip   = $this->config->get('invoicing.suspend_after_vip', $suspend_after);
         $remind_after  = $this->config->get('invoicing.remind_after', 10);
         $admin_after   = $this->config->get('invoicing.admin_remind_after', 1);
         $bcc_email     = $this->config->get('mail.notifications', null);
@@ -347,6 +348,11 @@
             // process unpaid invoices
             foreach ($invoices as $invoice) {
                 $overdue = $today->diff($invoice->invoicedate)->days;
+                $limit   = $suspend_after;
+
+                if ($suspend_vip > $limit && Config::boolean($user->attribute('vip'))) {
+                    $limit = $suspend_vip;
+                }
 
                 // replacement variables for mail texts
                 $replace = array(
@@ -357,7 +363,7 @@
                     'url'    => $this->url('billing/show', $invoice->ID),
                 );
 
-                if ($invoice->reminder_sent && $overdue >= $suspend_after
+                if ($invoice->reminder_sent && $overdue >= $limit
                     // suspend if reminder was sent at least 12 hours before now (#3159)
                     && $today_ts - $invoice->reminder_sent->format('U') > 12 * 60 * 60
                 ) {
@@ -927,6 +933,59 @@
         $this->done();
     }
 
+    /**
+     * Import exchange rates from x-rates.com
+     * and export as PHP array
+     */
+    protected function action_import_xrates()
+    {
+        $base_currency = strtoupper($this->config->get('site.currency', 'CHF'));
+        $api_key       = $this->config->get('site.exchangerates_api_key', 'e960487576d74172821e837f9c1469c9');
+        $query         = http_build_query(array('app_id' => $api_key, 'base' => 'USD'));
+        $url           = 'https://openexchangerates.org/api/latest.json?' . $query;
+        $html          = file_get_contents($url, false);
+        $rates         = array();
+
+        if ($html && ($result = json_decode($html, true)) && !empty($result['rates'])) {
+            foreach ($result['rates'] as $code => $rate) {
+                $rates[strtoupper($code)] = $rate;
+            }
+
+            if ($base_currency != 'USD') {
+                if ($base = $rates[$base_currency]) {
+                    foreach ($rates as $code => $rate) {
+                        $rates[$code] = $base / $rate;
+                    }
+                }
+                else {
+                    $rates = array();
+                }
+            }
+
+            if ($this->opts['verbose']) {
+                foreach ($rates as $code => $rate) {
+                    $this->stderr(sprintf("Update %s: %0.8f", $code, $rate));
+                }
+            }
+        }
+        else {
+            $this->fail("Failed to parse content of $url");
+        }
+
+        if (count($rates) > 1) {
+            $rates[$base_currency] = 1;
+            $out = '<?php return ' . var_export($rates, true) . ";\n";
+            if ($outfile = $this->config->get('currency.rates_source')) {
+                file_put_contents($outfile, $out);
+            }
+            else {
+                $this->stdout($out);
+            }
+        }
+
+        $this->done();
+    }
+
 
     /**
      * Compose an URL for a specific action

kolab-hkccp-0.7.20.tar.gz/lib/Kolab/Hosted/Model/Account.php -> kolab-hkccp-0.7.21.tar.gz/lib/Kolab/Hosted/Model/Account.php Changed

@@ -892,7 +892,7 @@
     /**
      * @inheritdoc
      */
-    public function update(array $tags, array $types = array(), $where = null)
+    public function update(array $tags, array $types = array(), $where = null, $immutable = false)
     {
         // execute status change actions
         if (empty($where) && !empty($tags['status']) && $tags['status'] != $this->_data['status']) {
@@ -1012,7 +1012,8 @@
 
             // delete all users
             if ($success) {
-                $this->query("UPDATE kolabusers SET enabled = 0 WHERE account = ?", array($this->_key));
+                $db = SQL\Connection::get_dbh();
+                $db->update('kolabusers', array('enabled' => 0), array('account' => $this->_key));
             }
         }
 
@@ -1115,6 +1116,7 @@
                 }
 
                 // count changed subscriptions, ignore these with no price change
+                // Note: for quota change the price will stay the same, but value will be different
                 $changed = $db->fetchColumn("SELECT COUNT(s.ID)"
                     . " FROM subscriptions s"
                     . " JOIN kolabusers u ON (s.UUID = u.UUID)"
@@ -1125,6 +1127,7 @@
                     . " ) ss ON (s.UUID = ss.UUID AND s.name = ss.name)"
                     . " WHERE u.account = ? AND s.changed > ? AND ("
                         . "(s.price <> ss.price)"
+                        . " OR (s.value <> ss.value)"
                         . " OR (s.price <> 0 AND ss.price IS NULL)"
                         . " OR (s.price IS NULL AND ss.price <> 0)"
                         . " OR (s.setup <> 0 AND ss.setup IS NULL)"

kolab-hkccp-0.7.20.tar.gz/lib/Kolab/Hosted/Model/Invoice.php -> kolab-hkccp-0.7.21.tar.gz/lib/Kolab/Hosted/Model/Invoice.php Changed

kolab-hkccp-0.7.20.tar.gz/lib/Kolab/Hosted/Model/InvoiceItem.php -> kolab-hkccp-0.7.21.tar.gz/lib/Kolab/Hosted/Model/InvoiceItem.php Changed

kolab-hkccp-0.7.20.tar.gz/lib/Kolab/SQL/DBI.php -> kolab-hkccp-0.7.21.tar.gz/lib/Kolab/SQL/DBI.php Changed

kolab-hkccp-0.7.20.tar.gz/tests/Kolab/Model/AccountTest.php -> kolab-hkccp-0.7.21.tar.gz/tests/Kolab/Model/AccountTest.php Changed

kolab-hkccp-0.7.20.tar.gz/tests/Kolab/SQL/DBITest.php -> kolab-hkccp-0.7.21.tar.gz/tests/Kolab/SQL/DBITest.php Changed

kolab-hkccp-0.7.20.tar.gz/tests/bootstrap.php -> kolab-hkccp-0.7.21.tar.gz/tests/bootstrap.php Changed

kolab-hkccp-0.7.20.tar.gz/tests/config-test.ini -> kolab-hkccp-0.7.21.tar.gz/tests/config-test.ini Changed

Changes of Revision 11