File pykolab-0.7.1-collated.patch of Package pykolab

File pykolab-0.7.1-collated.patch of Package pykolab (Revision 111)

Currently displaying revision 111 , Show latest

diff -ur pykolab-0.7.1.orig/pykolab/setup/setup_syncroton.py pykolab-0.7.1/pykolab/setup/setup_syncroton.py
--- pykolab-0.7.1.orig/pykolab/setup/setup_syncroton.py	2014-08-19 22:53:00.000000000 +0200
+++ pykolab-0.7.1/pykolab/setup/setup_syncroton.py	2014-08-21 10:16:37.542255943 +0200
@@ -52,9 +52,9 @@
                                 schema_files.append(schema_filepath)
                                 break
 
-                if len(schema_files) > 0
+                if len(schema_files) > 0:
                     break
-        if len(schema_files) > 0
+        if len(schema_files) > 0:
             break
 
     if not os.path.isfile('/tmp/kolab-setup-my.cnf'):
diff -ur pykolab-0.7.1.orig/share/templates/roundcubemail/config.inc.php.tpl pykolab-0.7.1/share/templates/roundcubemail/config.inc.php.tpl
--- pykolab-0.7.1.orig/share/templates/roundcubemail/config.inc.php.tpl	2014-08-19 12:30:29.000000000 +0200
+++ pykolab-0.7.1/share/templates/roundcubemail/config.inc.php.tpl	2014-08-21 10:16:51.950265904 +0200
@@ -6,6 +6,8 @@
     \$config['session_domain'] = '';
     \$config['des_key'] = "$des_key";
     \$config['username_domain'] = '$primary_domain';
+    \$config['use_secure_urls'] = true;
+    \$config['assets_path'] = '/assets/';
 
     \$config['mail_domain'] = '';
 
@@ -57,6 +59,7 @@
             'kolab_files',
             'kolab_folders',
             'kolab_notes',
+            'kolab_tags',
             'libkolab',
             'libcalendaring',
             'managesieve',
diff -ur pykolab-0.7.1.orig/share/templates/roundcubemail/kolab_files.inc.php.tpl pykolab-0.7.1/share/templates/roundcubemail/kolab_files.inc.php.tpl
--- pykolab-0.7.1.orig/share/templates/roundcubemail/kolab_files.inc.php.tpl	2014-01-23 21:49:12.000000000 +0100
+++ pykolab-0.7.1/share/templates/roundcubemail/kolab_files.inc.php.tpl	2014-08-21 10:16:46.819262356 +0200
@@ -1,7 +1,7 @@
 <?php
 
 // URL of kolab-chwala installation
-\$config['kolab_files_url'] = 'http://' . \$_SERVER['HTTP_HOST'] . '/chwala/';
+\$config['kolab_files_url'] = '/chwala/';
 
 // List of files list columns. Available are: name, size, mtime, type
 \$config['kolab_files_list_cols'] = array('name', 'mtime', 'size');