gunnar: server/kolab-webclient/turba/patches/turba-2.3.3 t_turba_HK_GW_ConfigurationOverride.php, NONE, 1.1 series, 1.1, 1.2

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/turba/patches/turba-2.3.3
In directory doto:/tmp/cvs-serv8548/kolab-webclient/turba/patches/turba-2.3.3

Modified Files:
	series 
Added Files:
	t_turba_HK_GW_ConfigurationOverride.php 
Log Message:
kolab/issue3859 ([turba] optimized formatName function and fallback to company attribute)

--- NEW FILE: t_turba_HK_GW_ConfigurationOverride.php ---
From: Gunnar Wrobel <p at rdus.de>
Subject: [PATCH] t/turba/HK/GW/ConfigurationOverride

Allow overriding configuration defaults.

STATUS: HACK

Signed-off-by: Gunnar Wrobel <p at rdus.de>

---
 lib/Object.php     |    6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

--- a/config/sources.php.dist	2009-08-05 23:06:10.000000000 +0200
+++ b/config/sources.php.dist	2010-03-09 22:21:04.000000000 +0100
@@ -1074,3 +1074,18 @@
     );
 }
 /* End Kolab sources. */
+
+// Load global configuration stanzas in .d directory
+$directory = dirname(__FILE__) . '/sources.d';
+if (file_exists($directory) && is_dir($directory)) {
+    $sub_files = glob("$directory/*.php");
+    if ($sub_files) {
+        foreach ($sub_files as $sub_file) {
+            ob_start();
+            $success = (is_null($var_names) && !$show_output)
+                ? include_once $sub_file
+                : include $sub_file;
+            $output = ob_get_clean();
+        }
+    }
+}
--- a/config/attributes.php.dist	2008-11-12 07:29:26.000000000 +0100
+++ b/config/attributes.php.dist	2010-03-09 22:21:26.000000000 +0100
@@ -610,3 +610,18 @@
     'type' => 'number',
     'required' => false,
 );
+
+// Load global configuration stanzas in .d directory
+$directory = dirname(__FILE__) . '/attributes.d';
+if (file_exists($directory) && is_dir($directory)) {
+    $sub_files = glob("$directory/*.php");
+    if ($sub_files) {
+        foreach ($sub_files as $sub_file) {
+            ob_start();
+            $success = (is_null($var_names) && !$show_output)
+                ? include_once $sub_file
+                : include $sub_file;
+            $output = ob_get_clean();
+        }
+    }
+}

Index: series
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/turba/patches/turba-2.3.3/series,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- series	22 Jan 2010 22:08:37 -0000	1.1
+++ series	9 Mar 2010 21:38:27 -0000	1.2
@@ -1,3 +1,4 @@
 t_turba_HK_GW_AllowAttributeDefaults.diff
 t_turba_HK_GW_FixAddressbookDeletion.diff
 t_turba_HK_GW_SyncMLrefresh.diff
+t_turba_HK_GW_ConfigurationOverride.php
\ No newline at end of file