2 commits - doc/hosted-kolab.conf lib/client

[Jeroen van Meeuwen]

 doc/hosted-kolab.conf                     |   37 ++++++++++++++++++++++++++++++
 lib/client/kolab_client_task_resource.php |    2 -
 2 files changed, 38 insertions(+), 1 deletion(-)

New commits:
commit 5552264b88fad9b763b6cf1b479b72e90e5d0a9b
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed Jul 25 09:55:04 2012 +0200

    Private function is supposed to be a public function

diff --git a/lib/client/kolab_client_task_resource.php b/lib/client/kolab_client_task_resource.php
index 222ddfc..55ece20 100644
--- a/lib/client/kolab_client_task_resource.php
+++ b/lib/client/kolab_client_task_resource.php
@@ -331,7 +331,7 @@ class kolab_client_task_resource extends kolab_client_task
      *
      * @return array List of resource types
      */
-    private function resource_types()
+    public function resource_types()
     {
         if (isset($_SESSION['resource_types'])) {
             return $_SESSION['resource_types'];


commit 114da9f312e2f330a3170abad564f89528bcc236
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed Jul 18 11:53:12 2012 +0100

    Add a sample configuration file for hosted-kolab

diff --git a/doc/hosted-kolab.conf b/doc/hosted-kolab.conf
new file mode 100644
index 0000000..2b3da86
--- /dev/null
+++ b/doc/hosted-kolab.conf
@@ -0,0 +1,37 @@
+# Kolab Groupware Server Web Administration Panel
+#
+# By default, this configuration file allows access to:
+#
+#   http://yourserver/kolab-webadmin
+#
+# You should configure your webserver to allow the client over SSL only.
+#
+# See the Kolab Groupware Installation Manual for more information.
+#
+
+Alias /hosted-kolab /usr/share/kolab-webadmin/hosted/
+
+<Directory "/usr/share/kolab-webadmin/hosted/">
+    <IfModule mod_rewrite.c>
+        RewriteEngine on
+        # NOTE: This needs to point to the base uri of your installation.
+        RewriteBase /hosted-kolab/
+
+        # Rewrite URLs of the form 'x' to the form 'index.php?q=x'.
+        RewriteCond %{REQUEST_FILENAME} !-f
+        RewriteCond %{REQUEST_FILENAME} !-d
+        RewriteCond %{REQUEST_URI} !=/favicon.ico
+        RewriteRule ^api/(.*)\.(.*)$ api/index.php?service=$1&method=$2 [L,QSA]
+
+    </IfModule>
+
+    AddDefaultCharset   UTF-8
+    php_value error_reporting      6135
+
+    DirectoryIndex index.php
+    AllowOverride All
+    Order Allow,Deny
+    Allow from All
+</Directory>
+
+