Kolab Groupware OBS

kolab-hkccp.spec Changed

kolab-hkccp-0.7.21.tar.gz/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/composer.phar -> kolab-hkccp-0.7.22.tar.gz/composer.phar Changed

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

kolab-hkccp-0.7.21.tar.gz/lib/Kolab/Hosted/Controller/SignupController.php -> kolab-hkccp-0.7.22.tar.gz/lib/Kolab/Hosted/Controller/SignupController.php Changed

@@ -368,6 +368,28 @@
                         $attributes['discount'] += floatval($account_prop['discount']);
                     }
 
+                    // voucher discounts
+                    if (!empty($_POST['voucher'])) {
+                        $voucher  = strtoupper(trim($_POST['voucher']));
+                        $vouchers = array();
+
+                        foreach (Config::arr($this->config->get('site.vouchers')) as $vv) {
+                            list($vname, $vdiscount) = explode(':', $vv);
+                            $vname = strtoupper(trim($vname));
+                            $vouchers[$vname] = round(floatval($vdiscount) / 100, 3);
+                        }
+
+                        if ($voucher && !empty($vouchers[$voucher])) {
+                            $attributes['discount']       += $vouchers[$voucher];
+                            $attributes['discountcomment'] = T('invoice.promodiscount');
+                            $attributes['voucher']         = $voucher;
+                        }
+                    }
+
+                    if (!empty($attributes['discount']) && $attributes['discount'] > 1) {
+                        $attributes['discount'] = 1;
+                    }
+
                     // store the selected subscription plan
                     $subscriptionplans = $this->config->get('subscriptionplan', array());
                     if (in_array($_POST['subscriptionplan'], array_keys($subscriptionplans))) {
@@ -510,6 +532,7 @@
             $this->output->set('tosdr', $tosdr);
         }
 
+        $this->output->set('vouchers', $this->config->get('site.vouchers'));
         $this->output->set('captcha', $captcha ? $captcha->html() : '');
         $this->output->set_env('storage', array_map('floatval', $this->config->get('storage')));
         $this->output->set_env('options', $jsoptions);

kolab-hkccp-0.7.21.tar.gz/lib/Kolab/Hosted/Model/Domain.php -> kolab-hkccp-0.7.22.tar.gz/lib/Kolab/Hosted/Model/Domain.php Changed

kolab-hkccp-0.7.21.tar.gz/lib/Kolab/Hosted/View/TwigOutput.php -> kolab-hkccp-0.7.22.tar.gz/lib/Kolab/Hosted/View/TwigOutput.php Changed

kolab-hkccp-0.7.21.tar.gz/localization/en.php -> kolab-hkccp-0.7.22.tar.gz/localization/en.php Changed

kolab-hkccp-0.7.21.tar.gz/public_html/skins/kolabnow/localization/en.php -> kolab-hkccp-0.7.22.tar.gz/public_html/skins/kolabnow/localization/en.php Changed

kolab-hkccp-0.7.21.tar.gz/public_html/skins/kolabnow/templates/signup.html -> kolab-hkccp-0.7.22.tar.gz/public_html/skins/kolabnow/templates/signup.html Changed

Changes of Revision 12