Kolab Groupware OBS

kolab-hkccp.spec Changed

kolab-hkccp-0.7.16.tar.gz/config/config-test.ini Deleted

@@ -1,253 +0,0 @@
-;; Hosted Kolab Customer Control Panel Test configuration
-
-kolab_wap
-; URI to the HKCCP test API endpoint
-api_url = http://localhost/hkccp-test/api.php
-domain = "example.org"
-root_dn = "dc=example,dc=org"
-hosted_auth_dn = "cn=Directory Manager"
-hosted_auth_pw = Welcome2KolabSystems
-service_auth_dn = "uid=hosted-kolab-service,ou=Special Users,%(kolab_wap.root_dn)"
-service_auth_pw = Welcome2KolabSystems
-admin_role = "cn=kolab-admin,%(kolab_wap.root_dn)"
-active_role = "cn=active-user,%(kolab_wap.root_dn)"
-suspended_role = "cn=suspended-user,%(kolab_wap.root_dn)"
-
-; logging
-log
-log_level = debug
-debug_mode = true
-log_dir = ./log/
-
-; The local database connection used for testing.
-; DATA WILL BE WIPED ON EVERY TEST RUN!
-sql
-dsn = mysql://kolab:Welcome2KolabSystems@localhost/hkccp_test
-dsnr = mysql://kolab:Welcome2KolabSystems@localhost/hkccp_test
-log = false
-
-session
-lifetime = 3600
-cookiename = hkccpsessid
-savepath = ./temp/session
-
-; settings for email sending
-mail
-driver = mail
-sender = noreply@example.org
-replyto = sales@example.org
-notifications = notifications@example.org
-support = support@example.org
-sendmail_args = "-fnoreply@mykolab.com"
-recipient_limit = 200
-
-; additional payment configuration for PayPal
-payment "paypal"
-provider = paypal
-account = paypal@kolabsys.com
-username = paypal_api1.kolabsys.com
-auth = YAUWYADDAYADDAYADDA
-signature = An5ks9Kso7MWUfW4ErQKJJJ4qi4-YADDAYADDAYADDAYADDA.Vp2K
-sandbox = true
-
-; configuration for the Bitpay API to accept Bitcoins
-payment "bitpay"
-provider = bitpay
-name = billing.displayname.bitpay
-auth = <api-key>
-transaction_speed = medium
-notification_email = notifications@example.org
-notification_full = false
-
-; display information for back transfer for annual and quartly paymentplans
-payment "banktransfer"
-provider = display
-paymentplan = annual,quarterly
-name = billing.banktransfer
-description = billing.banktransfer.content
-accountname = Company name
-iban = xxxx xxxx xxxx xxxx xxxx xx
-bankname = Bank
-bankaddress = Bank Address, yyyy City, Country
-swiftno = XXXXXXXXXX
-
-; settings for invoice due-checks
-invoicing
-remind_after = 10
-suspend_after = 30
-
-; configuration for invoice numbering
-invoiceno
-datestring = "Ym-%03\d"
-
-; general UI settings
-site
-sitename = "Example.org"
-base_url = "https://kolab.example.org/kolab-hkccp/"
-pricing_url = "https://kolab.example.org/pricing"
-tos_url = "https://kolab.example.org/tos"
-password_reset_info_url = "https://kolab.example.org/password-reset"
-tosdr = "mykolab-com;A"
-
-skin = default
-dateformat = d.m.Y
-timeformat = H:i
-addressformat = "{o}\n{cn}\n{street}\n{postalcode} {l}\n{c}"
-currency = CHF
-country = CH
-languages = en,fr
-locale = en_US
-vat_percent = 8
-vat_countries = CH,LI
-prices_updated = "2014-01-01 06:00"
-
-; DNS settings for custom domains
-dns
-ttl = 3600
-spf = "v=spf1 mx -all"
-static = "%s.    MX  10 ext-mx01.mykolab.com."
-
-; define source files for the GeoIP library
-geoip
-source = " /usr/share/GeoIP/GeoIP.dat"
-
-currency
-country_map  = "./temp/countries.php"       ; generated with `php bin/backend.php import_countries`
-rates_source = "./temp/exchange_rates.php"  ; generated with `php bin/backend.php import_oanada`
-
-; configure storage options
-storage
-min = 2048
-max = 10240
-unit = 1024
-price = 1
-
-;;
-;; Account Types
-;;
-
-; These show up as headers in the signup form.
-accounttype "useraccount"
-user_type_id = 5
-name = signup.type.useraccount
-email = true
-signup = true
-minlength = 4
-workflow = confirm,payment
-description = signup.type.useraccount.description
-
-accounttype "domainaccount"
-user_type_id = 6
-name = signup.type.domainaccount
-base_dn = "ou=people,$root_dn"
-uid = admin
-domain = true
-signup = true
-domain_user = domainuser
-workflow = confirm,activate
-description = signup.type.domainaccount.description
-
-; This is a regular user account for domain managers.
-; It is not available for signup (signup = false)
-accounttype "domainuser"
-user_type_id = 1
-name = signup.type.domainuser
-email = true
-signup = false
-
-;;
-;; Options added to Account Types
-;;
-
-; with price and the according LDAP role to be set
-option "useraccount"
-accounttype = "useraccount"
-ldap_role = "cn=kolab-user,$root_dn"
-implicit = true
-price = 10
-setup_price = {monthly=50, annual=0}
-
-option "domain"
-accounttype = domainaccount
-description = signup.customdomain.description
-ldap_role = "cn=kolab-admin,$root_dn"
-editable = false
-enable = true
-entity = domain
-type = domain
-value = ""
-required = true
-price = 1
-setup_price = {monthly=100, domainannual=50, biennial=0}
-
-option "domainuser"
-accounttype = domainuser
-ldap_role = "cn=kolab-user,$root_dn"
-implicit = true
-price = 10
-
-option "quota"
-accounttype = useraccount,domainuser
-ldap_attrib = "mailquota"
-unit = %(storage.unit)
-value = %(storage.unit)
-free_units = 2
-price = 1
-
-option "activesync"
-accounttype = useraccount,domainuser
-description = signup.activesync.description

kolab-hkccp-0.7.16.tar.gz/config/config.ini Deleted

@@ -1,253 +0,0 @@
-;; Hosted Kolab Customer Control Panel Test configuration
-
-kolab_wap
-; URI to the HKCCP test API endpoint
-api_url = http://localhost/hkccp-test/api.php
-domain = "example.org"
-root_dn = "dc=example,dc=org"
-hosted_auth_dn = "cn=Directory Manager"
-hosted_auth_pw = Welcome2KolabSystems
-service_auth_dn = "uid=hosted-kolab-service,ou=Special Users,%(kolab_wap.root_dn)"
-service_auth_pw = Welcome2KolabSystems
-admin_role = "cn=kolab-admin,%(kolab_wap.root_dn)"
-active_role = "cn=active-user,%(kolab_wap.root_dn)"
-suspended_role = "cn=suspended-user,%(kolab_wap.root_dn)"
-
-; logging
-log
-log_level = debug
-debug_mode = true
-log_dir = ./log/
-
-; The local database connection used for testing.
-; DATA WILL BE WIPED ON EVERY TEST RUN!
-sql
-dsn = mysql://kolab:Welcome2KolabSystems@localhost/hkccp_test
-dsnr = mysql://kolab:Welcome2KolabSystems@localhost/hkccp_test
-log = false
-
-session
-lifetime = 3600
-cookiename = hkccpsessid
-savepath = ./temp/session
-
-; settings for email sending
-mail
-driver = mail
-sender = noreply@example.org
-replyto = sales@example.org
-notifications = notifications@example.org
-support = support@example.org
-sendmail_args = "-fnoreply@mykolab.com"
-recipient_limit = 200
-
-; additional payment configuration for PayPal
-payment "paypal"
-provider = paypal
-account = paypal@kolabsys.com
-username = paypal_api1.kolabsys.com
-auth = YAUWYADDAYADDAYADDA
-signature = An5ks9Kso7MWUfW4ErQKJJJ4qi4-YADDAYADDAYADDAYADDA.Vp2K
-sandbox = true
-
-; configuration for the Bitpay API to accept Bitcoins
-payment "bitpay"
-provider = bitpay
-name = billing.displayname.bitpay
-auth = <api-key>
-transaction_speed = medium
-notification_email = notifications@example.org
-notification_full = false
-
-; display information for back transfer for annual and quartly paymentplans
-payment "banktransfer"
-provider = display
-paymentplan = annual,quarterly
-name = billing.banktransfer
-description = billing.banktransfer.content
-accountname = Company name
-iban = xxxx xxxx xxxx xxxx xxxx xx
-bankname = Bank
-bankaddress = Bank Address, yyyy City, Country
-swiftno = XXXXXXXXXX
-
-; settings for invoice due-checks
-invoicing
-remind_after = 10
-suspend_after = 30
-
-; configuration for invoice numbering
-invoiceno
-datestring = "Ym-%03\d"
-
-; general UI settings
-site
-sitename = "Example.org"
-base_url = "https://kolab.example.org/kolab-hkccp/"
-pricing_url = "https://kolab.example.org/pricing"
-tos_url = "https://kolab.example.org/tos"
-password_reset_info_url = "https://kolab.example.org/password-reset"
-tosdr = "mykolab-com;A"
-
-skin = default
-dateformat = d.m.Y
-timeformat = H:i
-addressformat = "{o}\n{cn}\n{street}\n{postalcode} {l}\n{c}"
-currency = CHF
-country = CH
-languages = en,fr
-locale = en_US
-vat_percent = 8
-vat_countries = CH,LI
-prices_updated = "2014-01-01 06:00"
-
-; DNS settings for custom domains
-dns
-ttl = 3600
-spf = "v=spf1 mx -all"
-static = "%s.    MX  10 ext-mx01.mykolab.com."
-
-; define source files for the GeoIP library
-geoip
-source = " /usr/share/GeoIP/GeoIP.dat"
-
-currency
-country_map  = "./temp/countries.php"       ; generated with `php bin/backend.php import_countries`
-rates_source = "./temp/exchange_rates.php"  ; generated with `php bin/backend.php import_oanada`
-
-; configure storage options
-storage
-min = 2048
-max = 10240
-unit = 1024
-price = 1
-
-;;
-;; Account Types
-;;
-
-; These show up as headers in the signup form.
-accounttype "useraccount"
-user_type_id = 5
-name = signup.type.useraccount
-email = true
-signup = true
-minlength = 4
-workflow = confirm,payment
-description = signup.type.useraccount.description
-
-accounttype "domainaccount"
-user_type_id = 6
-name = signup.type.domainaccount
-base_dn = "ou=people,$root_dn"
-uid = admin
-domain = true
-signup = true
-domain_user = domainuser
-workflow = confirm,activate
-description = signup.type.domainaccount.description
-
-; This is a regular user account for domain managers.
-; It is not available for signup (signup = false)
-accounttype "domainuser"
-user_type_id = 1
-name = signup.type.domainuser
-email = true
-signup = false
-
-;;
-;; Options added to Account Types
-;;
-
-; with price and the according LDAP role to be set
-option "useraccount"
-accounttype = "useraccount"
-ldap_role = "cn=kolab-user,$root_dn"
-implicit = true
-price = 10
-setup_price = {monthly=50, annual=0}
-
-option "domain"
-accounttype = domainaccount
-description = signup.customdomain.description
-ldap_role = "cn=kolab-admin,$root_dn"
-editable = false
-enable = true
-entity = domain
-type = domain
-value = ""
-required = true
-price = 1
-setup_price = {monthly=100, domainannual=50, biennial=0}
-
-option "domainuser"
-accounttype = domainuser
-ldap_role = "cn=kolab-user,$root_dn"
-implicit = true
-price = 10
-
-option "quota"
-accounttype = useraccount,domainuser
-ldap_attrib = "mailquota"
-unit = %(storage.unit)
-value = %(storage.unit)
-free_units = 2
-price = 1
-
-option "activesync"
-accounttype = useraccount,domainuser
-description = signup.activesync.description

kolab-hkccp-0.7.16.tar.gz/composer.phar -> kolab-hkccp-0.7.17.tar.gz/composer.phar Changed

kolab-hkccp-0.7.16.tar.gz/lib/Kolab/API/Client.php -> kolab-hkccp-0.7.17.tar.gz/lib/Kolab/API/Client.php Changed

@@ -577,16 +577,16 @@
             $response = $this->request->send();
         }
         catch (Exception $e) {
-            return new Result(null,
-                self::ERROR_CONNECTION, $e->getMessage());
+            Log::error("WAP Error: " . $e->getMessage());
+            return new Result(null, self::ERROR_CONNECTION, $e->getMessage());
         }
 
         try {
             $body = $response->getBody();
         }
         catch (Exception $e) {
-            return new Result(null,
-                self::ERROR_INTERNAL, $e->getMessage());
+            Log::error("WAP Error: " . $e->getMessage());
+            return new Result(null, self::ERROR_INTERNAL, $e->getMessage());
         }
 
         Log::trace("API Response: $body");
@@ -600,6 +600,7 @@
             $err_str  = !empty($body'reason') ? $body'reason' : 'Unknown error';
         }
         else if (!is_array($body)) {
+            Log::error("WAP Error: invalid format");
             $err_code = self::ERROR_INTERNAL;
             $err_str  = 'Unable to decode response';
         }

kolab-hkccp-0.7.16.tar.gz/lib/Kolab/Hosted/Controller/BackendController.php -> kolab-hkccp-0.7.17.tar.gz/lib/Kolab/Hosted/Controller/BackendController.php Changed

kolab-hkccp-0.7.16.tar.gz/lib/Kolab/Hosted/Model/KolabUser.php -> kolab-hkccp-0.7.17.tar.gz/lib/Kolab/Hosted/Model/KolabUser.php Changed

@@ -1082,12 +1082,9 @@
             KolabUser::set_status_roles('active', $this->_ldapdata'nsroledn', $updates);
 
             if ($updates) {
-                $api    = API\Client::get_user_instance();
-                $result = $api->post('user.edit', array(), $this->_ldapdata);
-
-                if ($result->get_error_code()) {
-                    $success = false;
-                }
+                $api     = API\Client::get_user_instance();
+                $result  = self::parse_api_result($api->post('user.edit', array(), $this->_ldapdata), 'user.edit');
+                $success = $result !== false;
             }
         }
 
@@ -1110,12 +1107,9 @@
             KolabUser::set_status_roles('suspended', $this->_ldapdata'nsroledn', $updates);
 
             if ($updates) {
-                $api    = API\Client::get_user_instance();
-                $result = $api->post('user.edit', array(), $this->_ldapdata);
-
-                if ($result->get_error_code()) {
-                    $success = false;
-                }
+                $api     = API\Client::get_user_instance();
+                $result  = self::parse_api_result($api->post('user.edit', array(), $this->_ldapdata), 'user.edit');
+                $success = $result !== false;
             }
         }

kolab-hkccp-0.7.16.tar.gz/lib/Kolab/Payment/Saferpay/API.php -> kolab-hkccp-0.7.17.tar.gz/lib/Kolab/Payment/Saferpay/API.php Changed

kolab-hkccp-0.7.16.tar.gz/lib/Kolab/Payment/Stripe/API.php -> kolab-hkccp-0.7.17.tar.gz/lib/Kolab/Payment/Stripe/API.php Changed

kolab-hkccp-0.7.16.tar.gz/public_html/skins/default/templates/include/billing.twig -> kolab-hkccp-0.7.17.tar.gz/public_html/skins/default/templates/include/billing.twig Changed

kolab-hkccp-0.7.16.tar.gz/public_html/skins/default/templates/include/forms.twig -> kolab-hkccp-0.7.17.tar.gz/public_html/skins/default/templates/include/forms.twig Changed

@@ -1,7 +1,7 @@
-{% macro input(name, value, type, class, required, placeholder, disabled) %}
+{% macro input(name, value, type, class, required, placeholder, disabled, autocomplete) %}
 {% set fieldtype = type in 'password','email','hidden' ? type : 'text' %}
 {% autoescape false %}
-<input type="{{ fieldtype }}" name="{{ name }}" id="ff{{ name }}" value="{{ value|e }}" class="{{ class|trim }}" {{ required ? 'required="required"' : '' }} {{ placeholder ? 'placeholder="' ~ placeholder|e ~ '"' : '' }} {{ disabled ? 'disabled="disabled"' : '' }} />
+<input type="{{ fieldtype }}" name="{{ name }}" id="ff{{ name }}" value="{{ value|e }}" class="{{ class|trim }}" {{ required ? 'required="required"' : '' }} {{ placeholder ? 'placeholder="' ~ placeholder|e ~ '"' : '' }} {{ disabled ? 'disabled="disabled"' : '' }} {{ autocomplete ? 'autocomplete="' ~ autocomplete|e ~ '"' : '' }} />
 {% endautoescape %}
 {% endmacro %}
 
@@ -84,7 +84,7 @@
 {% elseif attrib.type == 'list' %}
     {{ _self.list(attrib.name, attrib.value|default(attrib.default), 'list', attrib.class, attrib.required, attrib.placeholder, errors) }}
 {% else %}
-    {{ _self.input(attrib.name, attrib.type == 'password' ? '' : attrib.value|default(attrib.default), attrib.type|default('text'), attrib.class, attrib.required, attrib.placeholder, attrib.disabled) }}
+    {{ _self.input(attrib.name, attrib.type == 'password' ? '' : attrib.value|default(attrib.default), attrib.type|default('text'), attrib.class, attrib.required, attrib.placeholder, attrib.disabled, attrib.autocomplete) }}
 {% endif %}
 {%- endmacro -%}

kolab-hkccp-0.7.16.tar.gz/public_html/skins/ilovefs/templates/signup.html -> kolab-hkccp-0.7.17.tar.gz/public_html/skins/ilovefs/templates/signup.html Changed

kolab-hkccp-0.7.16.tar.gz/public_html/skins/kolabnow/localization/en.php -> kolab-hkccp-0.7.17.tar.gz/public_html/skins/kolabnow/localization/en.php Changed

@@ -50,7 +50,7 @@
 $texts'signup.progress.paymentoptions' = 'Payment Options';
 $texts'signup.progress.confirmation' = 'Confirmation';
 
-$texts'account.cancellationstatement' = '<b>Important:</b> You can try this service risk-free for 14 days. If within this period you decide to discontinue using {{sitename}}, just delete your account. For a full refund, please <a href="https://kolabnow.com/contact">contact us</a>. Make sure to state your invoice number and the PayPal transaction ID if applicable. For Bitcoin refunds, please make sure to provide the BTC address used for the transaction. If you haven\'t paid yet and do not wish to try the service, just <a href="/account/delete">deleting your account</a> will be sufficient. Kindly note that deletion of Group Accounts can only be done by our Support Team. Therefore, you will need to contact them if you wish to have yours deleted. Please make sure to provide your domain name and customer number.';
+$texts'account.cancellationstatement' = '<b>Important:</b> You can try this service risk-free for 30 days. If within this period you decide to discontinue using {{sitename}}, just delete your account. For a full refund, please <a href="https://kolabnow.com/contact">contact us</a>. Make sure to state your invoice number and the PayPal transaction ID if applicable. For Bitcoin refunds, please make sure to provide the BTC address used for the transaction. If you haven\'t paid yet and do not wish to try the service, just <a href="/account/delete">deleting your account</a> will be sufficient. Kindly note that deletion of Group Accounts can only be done by our Support Team. Therefore, you will need to contact them if you wish to have yours deleted. Please make sure to provide your domain name and customer number.';
 
 $texts'user.username' = 'Desired Email';
 
@@ -137,23 +137,54 @@
 
 $texts'signup.welcome.mailbody' = "Dear {{sitename}} user,
 
-Your account has now been fully activated.
+Your account has now been activated. You can log-in into the dashboard with *your login* ('{{email}}') and the *password* you entered during registration. The dashboard is available at https://kolabnow.com/cockpit/login.
 
-You can log-in into the dashboard with your login ('{{email}}') and the password you entered during registration.
+If you have *forgotten your password*, you can reset it here: https://kolabnow.com/cockpit/login/forgot.
 
-Also, you can now send and receive email with the address {{email}}, which is also what others in the system should be using if they want to share email folders, calendars, address books or tasks with you. As a first step, you probably want to log into the dashboard to check and adjust your subscription options. This is also where you will see your invoices and their status.
+ACTIVATION DELAY
+================
 
-The dashboard is available at https://kolabnow.com/cockpit/login
+Be aware that it may take *a few hours* before your mailbox is created. You will need to *pay your invoice* before your account is fully activated.
 
-Once you are done adjusting your options, you will find the web interface at https://kolabnow.com/apps
+30-DAY RISK-FREE TRIAL
+======================
 
-Other client programs can be hooked up to the service as well, including your mobile phone via ActiveSync - often called \"Exchange\" or \"Corporate\" account - if you selected that service. We have instructions for various clients available at https://kolabnow.com/clients
+You can try the service risk-free with our *30-day money-back guarantee*. If within this period you decide to stop using Kolab Now, you can simply delete your account from the dashboard and request a *full refund*.
 
-For other questions, please see our FAQ at https://kolabnow.com/faq
-If you still have a question that is not covered in the FAQ, please let us know at https://kolabnow.com/contact
+To request a full refund, contact us at accounting@kolabnow.com. If you haven't yet paid and do not wish to try the service, just delete your account at the dashboard.
 
-Best regards,
-Your Kolab Now Team
+To delete group accounts, you will need to contact *technical support* at support@kolabnow.com.
+
+As we are always looking for ways to improve our service, we would appreciate you telling us why you decided against using Kolab Now. Your opinion will helps us offer a better service.
+
+USING YOUR EMAIL
+================
+
+First, log into your dashboard to check and adjust your *subscription options*. This is also where you will see your invoices and their status. You will find the web interface for your email at https://kolabnow.com/apps.
+
+Once your mailbox is all set up, you can start sending and receiving emails using your annalarkham@kolabnow.com address. Other Kolab Now users can share email folders, calendars, address books, and tasks with you using your new address.
+
+LITE ACCOUNTS
+=============
+
+Note that if you have a Lite account, you will not have access to folders, calendars, and files as Lite accounts are for *mail only*.
+
+DESKTOP AND MOBILE EMAIL CLIENTS
+================================
+
+Other client programs can be hooked up to the service, including your mobile phone account via *ActiveSync* -- often called 'Exchange' or 'Corporate' account. Make sure you have selected this service for it to work.
+
+You can read all about configuring various clients at https://kolabnow.com/clients.
+
+FAQ
+===
+
+If you have any further questions, check out our FAQ at https://kolabnow.com/faq. If you still have questions not covered by the FAQ, don't hesitate to contact us at https://kolabnow.com/contact.
+
+
+Enjoy using Kolab Now!
+
+The Kolab Now Team
 ";
 
 $texts'signup.welcome.mailbody.domainmanager' = "Dear {{sitename}} user,
@@ -176,9 +207,9 @@
 Your Kolab Now Team
 ";
 
-$texts'signup.cancellationstatement' = "Try the service risk-free for 14 days: Right of Withdrawal
+$texts'signup.cancellationstatement' = "Try the service risk-free for 30 days: Right of Withdrawal
 
-You can try the service risk free for 14 days. If within this period you decide to discontinue using Kolab Now, you can simply delete your account from the dashboard. For a full re-fund, please contact us at sales@kolabnow.com. If you haven't yet paid and do not wish to try the service, just deleting your account in the dashboard will be sufficient. Group accounts need to contact technical support. Since we constantly look to improve our service, please also tell us why you decided to quit. Your opinion is very much appreciated.
+You can try the service risk free for 30 days. If within this period you decide to discontinue using Kolab Now, you can simply delete your account from the dashboard. For a full re-fund, please contact us at sales@kolabnow.com. If you haven't yet paid and do not wish to try the service, just deleting your account in the dashboard will be sufficient. Group accounts need to contact technical support. Since we constantly look to improve our service, please also tell us why you decided to quit. Your opinion is very much appreciated.
 ";
 
 $texts'billing.banktransfer.content' = '

kolab-hkccp-0.7.16.tar.gz/public_html/skins/kolabnow/templates/signup.html -> kolab-hkccp-0.7.17.tar.gz/public_html/skins/kolabnow/templates/signup.html Changed

kolab-hkccp-0.7.16.tar.gz/public_html/skins/ssd/localization/en.php -> kolab-hkccp-0.7.17.tar.gz/public_html/skins/ssd/localization/en.php Changed

kolab-hkccp-0.7.16.tar.gz/public_html/skins/ssd/templates/signup.html -> kolab-hkccp-0.7.17.tar.gz/public_html/skins/ssd/templates/signup.html Changed

Changes of Revision 2