summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2009-05-14 14:32:15 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2009-05-14 14:32:15 (GMT)
commit3c629929424ceee8d3d58d20fd6462163dcd21db (patch)
tree8ca9149c871fbe01ab7e783cdad0af1a408c43e0
parent06d75bad8955cde88a73e40020f8102b0e1c7493 (diff)
downloadserver-3c629929424ceee8d3d58d20fd6462163dcd21db.tar.gz
MFB (kolab/issue3420 (web client prefs and hooks should be configurable via templates))
-rw-r--r--kolab-webclient/ChangeLog7
-rw-r--r--kolab-webclient/kolab-webclient.spec4
-rw-r--r--patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch92
-rw-r--r--patches/horde-webmail/1.2.0/tg/t_GLOBAL_HK_GW_ConfigTemplateSupport.diff92
4 files changed, 101 insertions, 94 deletions
diff --git a/kolab-webclient/ChangeLog b/kolab-webclient/ChangeLog
index 011afb8..e1643e9 100644
--- a/kolab-webclient/ChangeLog
+++ b/kolab-webclient/ChangeLog
@@ -1,3 +1,10 @@
+2009-05-13 Gunnar Wrobel <p@rdus.de>
+
+ * kolab-webclient.spec:
+
+ kolab/issue3420 (web client prefs and hooks should be configurable
+ via templates)
+
2009-04-24 Gunnar Wrobel <p@rdus.de>
* kolab-webclient.spec: Additional fixes for configurable mapping
diff --git a/kolab-webclient/kolab-webclient.spec b/kolab-webclient/kolab-webclient.spec
index 6b200de..a15df0f 100644
--- a/kolab-webclient/kolab-webclient.spec
+++ b/kolab-webclient/kolab-webclient.spec
@@ -2,8 +2,8 @@
%define V_horde_name horde-webmail
%define V_package kolab-webclient
%define V_year 2009
-%define V_month 04
-%define V_day 24
+%define V_month 05
+%define V_day 13
%define V_version 1.2.0
%define V_source_version 1.2
%define V_passwd_version 3.0.1
diff --git a/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch b/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch
index b932a57..2840fa5 100644
--- a/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch
+++ b/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch
@@ -16090,7 +16090,7 @@ Notes:
Did this + a few manual edits ->
for FILE in `find horde-webmail/ -wholename *config/*.php | grep -v scripts`;do A=${FILE/*config\//}; B=${A/.php/.local.php};echo "if (file_exists(dirname(__FILE__) . '/$B')) {
- require_once(dirname(__FILE__) . '/$B');
+ require(dirname(__FILE__) . '/$B');
}
" >> $FILE;done
@@ -16166,7 +16166,7 @@ index 1fb2f6e..c7e41a2 100644
}
}*/
+if (file_exists(dirname(__FILE__) . '/hooks.local.php')) {
-+ require_once(dirname(__FILE__) . '/hooks.local.php');
++ require(dirname(__FILE__) . '/hooks.local.php');
+}
+
diff --git a/horde-webmail/config/mime_drivers.php b/horde-webmail/config/mime_drivers.php
@@ -16178,7 +16178,7 @@ index e963402..da0e14a 100644
)
);
+if (file_exists(dirname(__FILE__) . '/mime_drivers.local.php')) {
-+ require_once(dirname(__FILE__) . '/mime_drivers.local.php');
++ require(dirname(__FILE__) . '/mime_drivers.local.php');
+}
+
diff --git a/horde-webmail/config/motd.php b/horde-webmail/config/motd.php
@@ -16191,7 +16191,7 @@ index 9f0b57b..bca4c41 100644
+<?php
+if (file_exists(dirname(__FILE__) . '/motd.local.php')) {
-+ require_once(dirname(__FILE__) . '/motd.local.php');
++ require(dirname(__FILE__) . '/motd.local.php');
+}
+?>
+
@@ -16208,7 +16208,7 @@ index 21a3d19..8720096 100644
$GLOBALS['tz'] = &$tz;
+if (file_exists(dirname(__FILE__) . '/nls.local.php')) {
-+ require_once(dirname(__FILE__) . '/nls.local.php');
++ require(dirname(__FILE__) . '/nls.local.php');
+}
+
diff --git a/horde-webmail/config/prefs.php b/horde-webmail/config/prefs.php
@@ -16220,7 +16220,7 @@ index 52c7730..d3632dc 100644
);
// End Rich Text Editor preferences.
+if (file_exists(dirname(__FILE__) . '/prefs.local.php')) {
-+ require_once(dirname(__FILE__) . '/prefs.local.php');
++ require(dirname(__FILE__) . '/prefs.local.php');
+}
+
diff --git a/horde-webmail/config/registry.php b/horde-webmail/config/registry.php
@@ -16232,7 +16232,7 @@ index cbd6221..6268106 100644
return $webroot;
}
+if (file_exists(dirname(__FILE__) . '/registry.local.php')) {
-+ require_once(dirname(__FILE__) . '/registry.local.php');
++ require(dirname(__FILE__) . '/registry.local.php');
+}
+
diff --git a/horde-webmail/dimp/config/conf.php b/horde-webmail/dimp/config/conf.php
@@ -16244,7 +16244,7 @@ index de4e32c..83a50d4 100644
$conf['menu']['apps'] = array('turba', 'ingo', 'kronolith', 'nag', 'mnemo');
/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
+if (file_exists(dirname(__FILE__) . '/conf.local.php')) {
-+ require_once(dirname(__FILE__) . '/conf.local.php');
++ require(dirname(__FILE__) . '/conf.local.php');
+}
+
diff --git a/horde-webmail/dimp/config/hooks.php b/horde-webmail/dimp/config/hooks.php
@@ -16256,7 +16256,7 @@ index f315631..02a6dc7 100644
// }
// }
+if (file_exists(dirname(__FILE__) . '/hooks.local.php')) {
-+ require_once(dirname(__FILE__) . '/hooks.local.php');
++ require(dirname(__FILE__) . '/hooks.local.php');
+}
+
diff --git a/horde-webmail/dimp/config/menu.php b/horde-webmail/dimp/config/menu.php
@@ -16268,7 +16268,7 @@ index 5dcf354..842c4c5 100644
// 'icon' => $GLOBALS['registry']->getImageDir('horde') . '/horde.png'),
// );
+if (file_exists(dirname(__FILE__) . '/menu.local.php')) {
-+ require_once(dirname(__FILE__) . '/menu.local.php');
++ require(dirname(__FILE__) . '/menu.local.php');
+}
+
diff --git a/horde-webmail/dimp/config/portal.php b/horde-webmail/dimp/config/portal.php
@@ -16280,7 +16280,7 @@ index 7720eb3..3ccf2ae 100644
'ob' => $collection->getBlock('kronolith', 'summary', array())
);
+if (file_exists(dirname(__FILE__) . '/portal.local.php')) {
-+ require_once(dirname(__FILE__) . '/portal.local.php');
++ require(dirname(__FILE__) . '/portal.local.php');
+}
+
diff --git a/horde-webmail/dimp/config/prefs.php b/horde-webmail/dimp/config/prefs.php
@@ -16292,7 +16292,7 @@ index a55ecc2..09a0041 100644
'type' => 'implicit',
);
+if (file_exists(dirname(__FILE__) . '/prefs.local.php')) {
-+ require_once(dirname(__FILE__) . '/prefs.local.php');
++ require(dirname(__FILE__) . '/prefs.local.php');
+}
+
diff --git a/horde-webmail/dimp/config/servers.php b/horde-webmail/dimp/config/servers.php
@@ -16304,7 +16304,7 @@ index 30962f3..b0c5de9 100644
);
}
+if (file_exists(dirname(__FILE__) . '/servers.local.php')) {
-+ require_once(dirname(__FILE__) . '/servers.local.php');
++ require(dirname(__FILE__) . '/servers.local.php');
+}
+
diff --git a/horde-webmail/imp/config/conf.php b/horde-webmail/imp/config/conf.php
@@ -16316,7 +16316,7 @@ index 3a0f1d6..011472d 100644
$conf['notepad']['use_notepad'] = true;
/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
+if (file_exists(dirname(__FILE__) . '/conf.local.php')) {
-+ require_once(dirname(__FILE__) . '/conf.local.php');
++ require(dirname(__FILE__) . '/conf.local.php');
+}
+
diff --git a/horde-webmail/imp/config/header.php b/horde-webmail/imp/config/header.php
@@ -16328,7 +16328,7 @@ index a442e09..7cc941e 100644
/* Add your custom entries below this line. */
+if (file_exists(dirname(__FILE__) . '/header.local.php')) {
-+ require_once(dirname(__FILE__) . '/header.local.php');
++ require(dirname(__FILE__) . '/header.local.php');
+}
+
diff --git a/horde-webmail/imp/config/hooks.php b/horde-webmail/imp/config/hooks.php
@@ -16340,7 +16340,7 @@ index 3bab14e..3c39f20 100644
}
}
+if (file_exists(dirname(__FILE__) . '/hooks.local.php')) {
-+ require_once(dirname(__FILE__) . '/hooks.local.php');
++ require(dirname(__FILE__) . '/hooks.local.php');
+}
+
diff --git a/horde-webmail/imp/config/menu.php b/horde-webmail/imp/config/menu.php
@@ -16352,7 +16352,7 @@ index 1ea56c7..0d2925c 100644
/* Add your custom entries below this line. */
+if (file_exists(dirname(__FILE__) . '/menu.local.php')) {
-+ require_once(dirname(__FILE__) . '/menu.local.php');
++ require(dirname(__FILE__) . '/menu.local.php');
+}
+
diff --git a/horde-webmail/imp/config/mime_drivers.php b/horde-webmail/imp/config/mime_drivers.php
@@ -16364,7 +16364,7 @@ index 1019aaf..786934b 100644
)
);
+if (file_exists(dirname(__FILE__) . '/mime_drivers.local.php')) {
-+ require_once(dirname(__FILE__) . '/mime_drivers.local.php');
++ require(dirname(__FILE__) . '/mime_drivers.local.php');
+}
+
diff --git a/horde-webmail/imp/config/motd.php b/horde-webmail/imp/config/motd.php
@@ -16376,7 +16376,7 @@ index 70803c9..60a33f5 100644
// echo '<a class="small" href="' . $SERVER_HTTP_URL . '" target="_parent">' . _("Click here for Standard HTTP") . '</a> - <a class="small" href="' . $SERVER_SSL_URL . '" target="_parent">' . _("Click here for Secure HTTPS") . '</a></div>';
+if (file_exists(dirname(__FILE__) . '/motd.local.php')) {
-+ require_once(dirname(__FILE__) . '/motd.local.php');
++ require(dirname(__FILE__) . '/motd.local.php');
+}
?>
<br />
@@ -16391,7 +16391,7 @@ index e1f6426..02a28ab 100644
'shared' => false,
'type' => 'implicit');
+if (file_exists(dirname(__FILE__) . '/prefs.local.php')) {
-+ require_once(dirname(__FILE__) . '/prefs.local.php');
++ require(dirname(__FILE__) . '/prefs.local.php');
+}
+
diff --git a/horde-webmail/imp/config/servers.php b/horde-webmail/imp/config/servers.php
@@ -16403,7 +16403,7 @@ index 1c6e537..5fd0cf7 100644
);
}
+if (file_exists(dirname(__FILE__) . '/servers.local.php')) {
-+ require_once(dirname(__FILE__) . '/servers.local.php');
++ require(dirname(__FILE__) . '/servers.local.php');
+}
+
diff --git a/horde-webmail/imp/config/spelling.php b/horde-webmail/imp/config/spelling.php
@@ -16415,7 +16415,7 @@ index e9b78bd..7bbe2c2 100644
'nov', 'dec', 'fwd', 'http', 'https', 'html', 'email', 'bcc', 'jpg', 'gif'
);
+if (file_exists(dirname(__FILE__) . '/spelling.local.php')) {
-+ require_once(dirname(__FILE__) . '/spelling.local.php');
++ require(dirname(__FILE__) . '/spelling.local.php');
+}
+
diff --git a/horde-webmail/ingo/config/backends.php b/horde-webmail/ingo/config/backends.php
@@ -16427,7 +16427,7 @@ index d5e26c1..feeabb6 100644
);
}
+if (file_exists(dirname(__FILE__) . '/backends.local.php')) {
-+ require_once(dirname(__FILE__) . '/backends.local.php');
++ require(dirname(__FILE__) . '/backends.local.php');
+}
+
diff --git a/horde-webmail/ingo/config/conf.php b/horde-webmail/ingo/config/conf.php
@@ -16439,7 +16439,7 @@ index ffc834a..8a35d6f 100644
$conf['hooks']['vacation_only'] = true;
/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
+if (file_exists(dirname(__FILE__) . '/conf.local.php')) {
-+ require_once(dirname(__FILE__) . '/conf.local.php');
++ require(dirname(__FILE__) . '/conf.local.php');
+}
+
diff --git a/horde-webmail/ingo/config/fields.php b/horde-webmail/ingo/config/fields.php
@@ -16451,7 +16451,7 @@ index 045ff52..82fc932 100644
)
);
+if (file_exists(dirname(__FILE__) . '/fields.local.php')) {
-+ require_once(dirname(__FILE__) . '/fields.local.php');
++ require(dirname(__FILE__) . '/fields.local.php');
+}
+
diff --git a/horde-webmail/ingo/config/hooks.php b/horde-webmail/ingo/config/hooks.php
@@ -16463,7 +16463,7 @@ index 9e52c95..9e9685c 100644
// }
// }
+if (file_exists(dirname(__FILE__) . '/hooks.local.php')) {
-+ require_once(dirname(__FILE__) . '/hooks.local.php');
++ require(dirname(__FILE__) . '/hooks.local.php');
+}
+
diff --git a/horde-webmail/ingo/config/prefs.php b/horde-webmail/ingo/config/prefs.php
@@ -16475,7 +16475,7 @@ index fe645fb..0f7641e 100644
'type' => 'implicit'
);
+if (file_exists(dirname(__FILE__) . '/prefs.local.php')) {
-+ require_once(dirname(__FILE__) . '/prefs.local.php');
++ require(dirname(__FILE__) . '/prefs.local.php');
+}
+
diff --git a/horde-webmail/kronolith/config/keywords.php b/horde-webmail/kronolith/config/keywords.php
@@ -16487,7 +16487,7 @@ index 6ed32d5..f227f74 100644
$keywords[_("Type")] = array(_("Birthday"), _("Meeting"), _("Game"));
+if (file_exists(dirname(__FILE__) . '/keywords.local.php')) {
-+ require_once(dirname(__FILE__) . '/keywords.local.php');
++ require(dirname(__FILE__) . '/keywords.local.php');
+}
+
diff --git a/horde-webmail/kronolith/config/menu.php b/horde-webmail/kronolith/config/menu.php
@@ -16499,7 +16499,7 @@ index 282ac8a..f097cb6 100644
/* Add your custom entries below this line. */
+if (file_exists(dirname(__FILE__) . '/menu.local.php')) {
-+ require_once(dirname(__FILE__) . '/menu.local.php');
++ require(dirname(__FILE__) . '/menu.local.php');
+}
+
diff --git a/horde-webmail/kronolith/config/prefs.php b/horde-webmail/kronolith/config/prefs.php
@@ -16511,7 +16511,7 @@ index 22c08c3..099c385 100644
'type' => 'implicit'
);
+if (file_exists(dirname(__FILE__) . '/prefs.local.php')) {
-+ require_once(dirname(__FILE__) . '/prefs.local.php');
++ require(dirname(__FILE__) . '/prefs.local.php');
+}
+
diff --git a/horde-webmail/mimp/config/conf.php b/horde-webmail/mimp/config/conf.php
@@ -16523,7 +16523,7 @@ index 29762a5..dcd6165 100644
$conf['mailbox']['max_subj_chars'] = 20;
/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
+if (file_exists(dirname(__FILE__) . '/conf.local.php')) {
-+ require_once(dirname(__FILE__) . '/conf.local.php');
++ require(dirname(__FILE__) . '/conf.local.php');
+}
+
diff --git a/horde-webmail/mimp/config/menu.php b/horde-webmail/mimp/config/menu.php
@@ -16535,7 +16535,7 @@ index 2f0a5c7..46bbf9e 100644
/* Add your custom entries below this line. */
+if (file_exists(dirname(__FILE__) . '/menu.local.php')) {
-+ require_once(dirname(__FILE__) . '/menu.local.php');
++ require(dirname(__FILE__) . '/menu.local.php');
+}
+
diff --git a/horde-webmail/mimp/config/mime_drivers.php b/horde-webmail/mimp/config/mime_drivers.php
@@ -16547,7 +16547,7 @@ index 1666a86..6c0843c 100644
)
);
+if (file_exists(dirname(__FILE__) . '/mime_drivers.local.php')) {
-+ require_once(dirname(__FILE__) . '/mime_drivers.local.php');
++ require(dirname(__FILE__) . '/mime_drivers.local.php');
+}
+
diff --git a/horde-webmail/mimp/config/prefs.php b/horde-webmail/mimp/config/prefs.php
@@ -16559,7 +16559,7 @@ index 52bbb95..1d3ddf6 100644
// End Message Viewing preferences
+if (file_exists(dirname(__FILE__) . '/prefs.local.php')) {
-+ require_once(dirname(__FILE__) . '/prefs.local.php');
++ require(dirname(__FILE__) . '/prefs.local.php');
+}
+
diff --git a/horde-webmail/mnemo/config/conf.php b/horde-webmail/mnemo/config/conf.php
@@ -16571,7 +16571,7 @@ index a4e9764..864f011 100644
$conf['menu']['apps'] = array();
/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
+if (file_exists(dirname(__FILE__) . '/conf.local.php')) {
-+ require_once(dirname(__FILE__) . '/conf.local.php');
++ require(dirname(__FILE__) . '/conf.local.php');
+}
+
diff --git a/horde-webmail/mnemo/config/prefs.php b/horde-webmail/mnemo/config/prefs.php
@@ -16583,7 +16583,7 @@ index b83d5a4..09133c7 100644
'desc' => _("Do you want to confirm deleting entries?")
);
+if (file_exists(dirname(__FILE__) . '/prefs.local.php')) {
-+ require_once(dirname(__FILE__) . '/prefs.local.php');
++ require(dirname(__FILE__) . '/prefs.local.php');
+}
+
diff --git a/horde-webmail/nag/config/conf.php b/horde-webmail/nag/config/conf.php
@@ -16595,7 +16595,7 @@ index 7809067..a0396f7 100644
$conf['menu']['apps'] = array();
/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
+if (file_exists(dirname(__FILE__) . '/conf.local.php')) {
-+ require_once(dirname(__FILE__) . '/conf.local.php');
++ require(dirname(__FILE__) . '/conf.local.php');
+}
+
diff --git a/horde-webmail/nag/config/menu.php b/horde-webmail/nag/config/menu.php
@@ -16607,7 +16607,7 @@ index 162c88c..457a10d 100644
/* Add your custom entries below this line. */
+if (file_exists(dirname(__FILE__) . '/menu.local.php')) {
-+ require_once(dirname(__FILE__) . '/menu.local.php');
++ require(dirname(__FILE__) . '/menu.local.php');
+}
+
diff --git a/horde-webmail/nag/config/prefs.php b/horde-webmail/nag/config/prefs.php
@@ -16619,7 +16619,7 @@ index e14bd8a..bf2d841 100644
'type' => 'implicit',
);
+if (file_exists(dirname(__FILE__) . '/prefs.local.php')) {
-+ require_once(dirname(__FILE__) . '/prefs.local.php');
++ require(dirname(__FILE__) . '/prefs.local.php');
+}
+
diff --git a/horde-webmail/turba/config/attributes.php b/horde-webmail/turba/config/attributes.php
@@ -16631,7 +16631,7 @@ index ce124f0..adec673 100644
'required' => false,
);
+if (file_exists(dirname(__FILE__) . '/attributes.local.php')) {
-+ require_once(dirname(__FILE__) . '/attributes.local.php');
++ require(dirname(__FILE__) . '/attributes.local.php');
+}
+
diff --git a/horde-webmail/turba/config/conf.php b/horde-webmail/turba/config/conf.php
@@ -16643,7 +16643,7 @@ index b83f681..8f00f61 100644
$conf['documents']['type'] = 'horde';
/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
+if (file_exists(dirname(__FILE__) . '/conf.local.php')) {
-+ require_once(dirname(__FILE__) . '/conf.local.php');
++ require(dirname(__FILE__) . '/conf.local.php');
+}
+
diff --git a/horde-webmail/turba/config/hooks.php b/horde-webmail/turba/config/hooks.php
@@ -16655,7 +16655,7 @@ index b7d0d40..d423897 100644
// }
// }
+if (file_exists(dirname(__FILE__) . '/hooks.local.php')) {
-+ require_once(dirname(__FILE__) . '/hooks.local.php');
++ require(dirname(__FILE__) . '/hooks.local.php');
+}
+
diff --git a/horde-webmail/turba/config/menu.php b/horde-webmail/turba/config/menu.php
@@ -16667,7 +16667,7 @@ index 418a4b3..49022bf 100644
/* Add your custom entries below this line. */
+if (file_exists(dirname(__FILE__) . '/menu.local.php')) {
-+ require_once(dirname(__FILE__) . '/menu.local.php');
++ require(dirname(__FILE__) . '/menu.local.php');
+}
+
diff --git a/horde-webmail/turba/config/mime_drivers.php b/horde-webmail/turba/config/mime_drivers.php
@@ -16679,7 +16679,7 @@ index 729ca75..7395c13 100644
* the format.
*/
+if (file_exists(dirname(__FILE__) . '/mime_drivers.local.php')) {
-+ require_once(dirname(__FILE__) . '/mime_drivers.local.php');
++ require(dirname(__FILE__) . '/mime_drivers.local.php');
+}
+
diff --git a/horde-webmail/turba/config/prefs.php b/horde-webmail/turba/config/prefs.php
@@ -16691,7 +16691,7 @@ index 2f7c7c3..c2d74f5 100644
'type' => 'implicit'
);
+if (file_exists(dirname(__FILE__) . '/prefs.local.php')) {
-+ require_once(dirname(__FILE__) . '/prefs.local.php');
++ require(dirname(__FILE__) . '/prefs.local.php');
+}
+
diff --git a/horde-webmail/turba/config/sources.php b/horde-webmail/turba/config/sources.php
@@ -16703,7 +16703,7 @@ index 083defe..d6acb36 100644
'browse' => true,
);
+if (file_exists(dirname(__FILE__) . '/sources.local.php')) {
-+ require_once(dirname(__FILE__) . '/sources.local.php');
++ require(dirname(__FILE__) . '/sources.local.php');
+}
+
--
diff --git a/patches/horde-webmail/1.2.0/tg/t_GLOBAL_HK_GW_ConfigTemplateSupport.diff b/patches/horde-webmail/1.2.0/tg/t_GLOBAL_HK_GW_ConfigTemplateSupport.diff
index 1b5a834..646da34 100644
--- a/patches/horde-webmail/1.2.0/tg/t_GLOBAL_HK_GW_ConfigTemplateSupport.diff
+++ b/patches/horde-webmail/1.2.0/tg/t_GLOBAL_HK_GW_ConfigTemplateSupport.diff
@@ -13,7 +13,7 @@ Notes:
Did this + a few manual edits ->
for FILE in `find horde-webmail/ -wholename *config/*.php | grep -v scripts`;do A=${FILE/*config\//}; B=${A/.php/.local.php};echo "if (file_exists(dirname(__FILE__) . '/$B')) {
- require_once(dirname(__FILE__) . '/$B');
+ require(dirname(__FILE__) . '/$B');
}
" >> $FILE;done
@@ -89,7 +89,7 @@ index 1fb2f6e..c7e41a2 100644
}
}*/
+if (file_exists(dirname(__FILE__) . '/hooks.local.php')) {
-+ require_once(dirname(__FILE__) . '/hooks.local.php');
++ require(dirname(__FILE__) . '/hooks.local.php');
+}
+
diff --git a/horde-webmail/config/mime_drivers.php b/horde-webmail/config/mime_drivers.php
@@ -101,7 +101,7 @@ index e963402..da0e14a 100644
)
);
+if (file_exists(dirname(__FILE__) . '/mime_drivers.local.php')) {
-+ require_once(dirname(__FILE__) . '/mime_drivers.local.php');
++ require(dirname(__FILE__) . '/mime_drivers.local.php');
+}
+
diff --git a/horde-webmail/config/motd.php b/horde-webmail/config/motd.php
@@ -114,7 +114,7 @@ index 9f0b57b..bca4c41 100644
+<?php
+if (file_exists(dirname(__FILE__) . '/motd.local.php')) {
-+ require_once(dirname(__FILE__) . '/motd.local.php');
++ require(dirname(__FILE__) . '/motd.local.php');
+}
+?>
+
@@ -131,7 +131,7 @@ index 21a3d19..8720096 100644
$GLOBALS['tz'] = &$tz;
+if (file_exists(dirname(__FILE__) . '/nls.local.php')) {
-+ require_once(dirname(__FILE__) . '/nls.local.php');
++ require(dirname(__FILE__) . '/nls.local.php');
+}
+
diff --git a/horde-webmail/config/prefs.php b/horde-webmail/config/prefs.php
@@ -143,7 +143,7 @@ index 52c7730..d3632dc 100644
);
// End Rich Text Editor preferences.
+if (file_exists(dirname(__FILE__) . '/prefs.local.php')) {
-+ require_once(dirname(__FILE__) . '/prefs.local.php');
++ require(dirname(__FILE__) . '/prefs.local.php');
+}
+
diff --git a/horde-webmail/config/registry.php b/horde-webmail/config/registry.php
@@ -155,7 +155,7 @@ index cbd6221..6268106 100644
return $webroot;
}
+if (file_exists(dirname(__FILE__) . '/registry.local.php')) {
-+ require_once(dirname(__FILE__) . '/registry.local.php');
++ require(dirname(__FILE__) . '/registry.local.php');
+}
+
diff --git a/horde-webmail/dimp/config/conf.php b/horde-webmail/dimp/config/conf.php
@@ -167,7 +167,7 @@ index de4e32c..83a50d4 100644
$conf['menu']['apps'] = array('turba', 'ingo', 'kronolith', 'nag', 'mnemo');
/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
+if (file_exists(dirname(__FILE__) . '/conf.local.php')) {
-+ require_once(dirname(__FILE__) . '/conf.local.php');
++ require(dirname(__FILE__) . '/conf.local.php');
+}
+
diff --git a/horde-webmail/dimp/config/hooks.php b/horde-webmail/dimp/config/hooks.php
@@ -179,7 +179,7 @@ index f315631..02a6dc7 100644
// }
// }
+if (file_exists(dirname(__FILE__) . '/hooks.local.php')) {
-+ require_once(dirname(__FILE__) . '/hooks.local.php');
++ require(dirname(__FILE__) . '/hooks.local.php');
+}
+
diff --git a/horde-webmail/dimp/config/menu.php b/horde-webmail/dimp/config/menu.php
@@ -191,7 +191,7 @@ index 5dcf354..842c4c5 100644
// 'icon' => $GLOBALS['registry']->getImageDir('horde') . '/horde.png'),
// );
+if (file_exists(dirname(__FILE__) . '/menu.local.php')) {
-+ require_once(dirname(__FILE__) . '/menu.local.php');
++ require(dirname(__FILE__) . '/menu.local.php');
+}
+
diff --git a/horde-webmail/dimp/config/portal.php b/horde-webmail/dimp/config/portal.php
@@ -203,7 +203,7 @@ index 7720eb3..3ccf2ae 100644
'ob' => $collection->getBlock('kronolith', 'summary', array())
);
+if (file_exists(dirname(__FILE__) . '/portal.local.php')) {
-+ require_once(dirname(__FILE__) . '/portal.local.php');
++ require(dirname(__FILE__) . '/portal.local.php');
+}
+
diff --git a/horde-webmail/dimp/config/prefs.php b/horde-webmail/dimp/config/prefs.php
@@ -215,7 +215,7 @@ index a55ecc2..09a0041 100644
'type' => 'implicit',
);
+if (file_exists(dirname(__FILE__) . '/prefs.local.php')) {
-+ require_once(dirname(__FILE__) . '/prefs.local.php');
++ require(dirname(__FILE__) . '/prefs.local.php');
+}
+
diff --git a/horde-webmail/dimp/config/servers.php b/horde-webmail/dimp/config/servers.php
@@ -227,7 +227,7 @@ index 30962f3..b0c5de9 100644
);
}
+if (file_exists(dirname(__FILE__) . '/servers.local.php')) {
-+ require_once(dirname(__FILE__) . '/servers.local.php');
++ require(dirname(__FILE__) . '/servers.local.php');
+}
+
diff --git a/horde-webmail/imp/config/conf.php b/horde-webmail/imp/config/conf.php
@@ -239,7 +239,7 @@ index 3a0f1d6..011472d 100644
$conf['notepad']['use_notepad'] = true;
/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
+if (file_exists(dirname(__FILE__) . '/conf.local.php')) {
-+ require_once(dirname(__FILE__) . '/conf.local.php');
++ require(dirname(__FILE__) . '/conf.local.php');
+}
+
diff --git a/horde-webmail/imp/config/header.php b/horde-webmail/imp/config/header.php
@@ -251,7 +251,7 @@ index a442e09..7cc941e 100644
/* Add your custom entries below this line. */
+if (file_exists(dirname(__FILE__) . '/header.local.php')) {
-+ require_once(dirname(__FILE__) . '/header.local.php');
++ require(dirname(__FILE__) . '/header.local.php');
+}
+
diff --git a/horde-webmail/imp/config/hooks.php b/horde-webmail/imp/config/hooks.php
@@ -263,7 +263,7 @@ index 3bab14e..3c39f20 100644
}
}
+if (file_exists(dirname(__FILE__) . '/hooks.local.php')) {
-+ require_once(dirname(__FILE__) . '/hooks.local.php');
++ require(dirname(__FILE__) . '/hooks.local.php');
+}
+
diff --git a/horde-webmail/imp/config/menu.php b/horde-webmail/imp/config/menu.php
@@ -275,7 +275,7 @@ index 1ea56c7..0d2925c 100644
/* Add your custom entries below this line. */
+if (file_exists(dirname(__FILE__) . '/menu.local.php')) {
-+ require_once(dirname(__FILE__) . '/menu.local.php');
++ require(dirname(__FILE__) . '/menu.local.php');
+}
+
diff --git a/horde-webmail/imp/config/mime_drivers.php b/horde-webmail/imp/config/mime_drivers.php
@@ -287,7 +287,7 @@ index 1019aaf..786934b 100644
)
);
+if (file_exists(dirname(__FILE__) . '/mime_drivers.local.php')) {
-+ require_once(dirname(__FILE__) . '/mime_drivers.local.php');
++ require(dirname(__FILE__) . '/mime_drivers.local.php');
+}
+
diff --git a/horde-webmail/imp/config/motd.php b/horde-webmail/imp/config/motd.php
@@ -299,7 +299,7 @@ index 70803c9..60a33f5 100644
// echo '<a class="small" href="' . $SERVER_HTTP_URL . '" target="_parent">' . _("Click here for Standard HTTP") . '</a> - <a class="small" href="' . $SERVER_SSL_URL . '" target="_parent">' . _("Click here for Secure HTTPS") . '</a></div>';
+if (file_exists(dirname(__FILE__) . '/motd.local.php')) {
-+ require_once(dirname(__FILE__) . '/motd.local.php');
++ require(dirname(__FILE__) . '/motd.local.php');
+}
?>
<br />
@@ -314,7 +314,7 @@ index e1f6426..02a28ab 100644
'shared' => false,
'type' => 'implicit');
+if (file_exists(dirname(__FILE__) . '/prefs.local.php')) {
-+ require_once(dirname(__FILE__) . '/prefs.local.php');
++ require(dirname(__FILE__) . '/prefs.local.php');
+}
+
diff --git a/horde-webmail/imp/config/servers.php b/horde-webmail/imp/config/servers.php
@@ -326,7 +326,7 @@ index 1c6e537..5fd0cf7 100644
);
}
+if (file_exists(dirname(__FILE__) . '/servers.local.php')) {
-+ require_once(dirname(__FILE__) . '/servers.local.php');
++ require(dirname(__FILE__) . '/servers.local.php');
+}
+
diff --git a/horde-webmail/imp/config/spelling.php b/horde-webmail/imp/config/spelling.php
@@ -338,7 +338,7 @@ index e9b78bd..7bbe2c2 100644
'nov', 'dec', 'fwd', 'http', 'https', 'html', 'email', 'bcc', 'jpg', 'gif'
);
+if (file_exists(dirname(__FILE__) . '/spelling.local.php')) {
-+ require_once(dirname(__FILE__) . '/spelling.local.php');
++ require(dirname(__FILE__) . '/spelling.local.php');
+}
+
diff --git a/horde-webmail/ingo/config/backends.php b/horde-webmail/ingo/config/backends.php
@@ -350,7 +350,7 @@ index d5e26c1..feeabb6 100644
);
}
+if (file_exists(dirname(__FILE__) . '/backends.local.php')) {
-+ require_once(dirname(__FILE__) . '/backends.local.php');
++ require(dirname(__FILE__) . '/backends.local.php');
+}
+
diff --git a/horde-webmail/ingo/config/conf.php b/horde-webmail/ingo/config/conf.php
@@ -362,7 +362,7 @@ index ffc834a..8a35d6f 100644
$conf['hooks']['vacation_only'] = true;
/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
+if (file_exists(dirname(__FILE__) . '/conf.local.php')) {
-+ require_once(dirname(__FILE__) . '/conf.local.php');
++ require(dirname(__FILE__) . '/conf.local.php');
+}
+
diff --git a/horde-webmail/ingo/config/fields.php b/horde-webmail/ingo/config/fields.php
@@ -374,7 +374,7 @@ index 045ff52..82fc932 100644
)
);
+if (file_exists(dirname(__FILE__) . '/fields.local.php')) {
-+ require_once(dirname(__FILE__) . '/fields.local.php');
++ require(dirname(__FILE__) . '/fields.local.php');
+}
+
diff --git a/horde-webmail/ingo/config/hooks.php b/horde-webmail/ingo/config/hooks.php
@@ -386,7 +386,7 @@ index 9e52c95..9e9685c 100644
// }
// }
+if (file_exists(dirname(__FILE__) . '/hooks.local.php')) {
-+ require_once(dirname(__FILE__) . '/hooks.local.php');
++ require(dirname(__FILE__) . '/hooks.local.php');
+}
+
diff --git a/horde-webmail/ingo/config/prefs.php b/horde-webmail/ingo/config/prefs.php
@@ -398,7 +398,7 @@ index fe645fb..0f7641e 100644
'type' => 'implicit'
);
+if (file_exists(dirname(__FILE__) . '/prefs.local.php')) {
-+ require_once(dirname(__FILE__) . '/prefs.local.php');
++ require(dirname(__FILE__) . '/prefs.local.php');
+}
+
diff --git a/horde-webmail/kronolith/config/keywords.php b/horde-webmail/kronolith/config/keywords.php
@@ -410,7 +410,7 @@ index 6ed32d5..f227f74 100644
$keywords[_("Type")] = array(_("Birthday"), _("Meeting"), _("Game"));
+if (file_exists(dirname(__FILE__) . '/keywords.local.php')) {
-+ require_once(dirname(__FILE__) . '/keywords.local.php');
++ require(dirname(__FILE__) . '/keywords.local.php');
+}
+
diff --git a/horde-webmail/kronolith/config/menu.php b/horde-webmail/kronolith/config/menu.php
@@ -422,7 +422,7 @@ index 282ac8a..f097cb6 100644
/* Add your custom entries below this line. */
+if (file_exists(dirname(__FILE__) . '/menu.local.php')) {
-+ require_once(dirname(__FILE__) . '/menu.local.php');
++ require(dirname(__FILE__) . '/menu.local.php');
+}
+
diff --git a/horde-webmail/kronolith/config/prefs.php b/horde-webmail/kronolith/config/prefs.php
@@ -434,7 +434,7 @@ index 22c08c3..099c385 100644
'type' => 'implicit'
);
+if (file_exists(dirname(__FILE__) . '/prefs.local.php')) {
-+ require_once(dirname(__FILE__) . '/prefs.local.php');
++ require(dirname(__FILE__) . '/prefs.local.php');
+}
+
diff --git a/horde-webmail/mimp/config/conf.php b/horde-webmail/mimp/config/conf.php
@@ -446,7 +446,7 @@ index 29762a5..dcd6165 100644
$conf['mailbox']['max_subj_chars'] = 20;
/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
+if (file_exists(dirname(__FILE__) . '/conf.local.php')) {
-+ require_once(dirname(__FILE__) . '/conf.local.php');
++ require(dirname(__FILE__) . '/conf.local.php');
+}
+
diff --git a/horde-webmail/mimp/config/menu.php b/horde-webmail/mimp/config/menu.php
@@ -458,7 +458,7 @@ index 2f0a5c7..46bbf9e 100644
/* Add your custom entries below this line. */
+if (file_exists(dirname(__FILE__) . '/menu.local.php')) {
-+ require_once(dirname(__FILE__) . '/menu.local.php');
++ require(dirname(__FILE__) . '/menu.local.php');
+}
+
diff --git a/horde-webmail/mimp/config/mime_drivers.php b/horde-webmail/mimp/config/mime_drivers.php
@@ -470,7 +470,7 @@ index 1666a86..6c0843c 100644
)
);
+if (file_exists(dirname(__FILE__) . '/mime_drivers.local.php')) {
-+ require_once(dirname(__FILE__) . '/mime_drivers.local.php');
++ require(dirname(__FILE__) . '/mime_drivers.local.php');
+}
+
diff --git a/horde-webmail/mimp/config/prefs.php b/horde-webmail/mimp/config/prefs.php
@@ -482,7 +482,7 @@ index 52bbb95..1d3ddf6 100644
// End Message Viewing preferences
+if (file_exists(dirname(__FILE__) . '/prefs.local.php')) {
-+ require_once(dirname(__FILE__) . '/prefs.local.php');
++ require(dirname(__FILE__) . '/prefs.local.php');
+}
+
diff --git a/horde-webmail/mnemo/config/conf.php b/horde-webmail/mnemo/config/conf.php
@@ -494,7 +494,7 @@ index a4e9764..864f011 100644
$conf['menu']['apps'] = array();
/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
+if (file_exists(dirname(__FILE__) . '/conf.local.php')) {
-+ require_once(dirname(__FILE__) . '/conf.local.php');
++ require(dirname(__FILE__) . '/conf.local.php');
+}
+
diff --git a/horde-webmail/mnemo/config/prefs.php b/horde-webmail/mnemo/config/prefs.php
@@ -506,7 +506,7 @@ index b83d5a4..09133c7 100644
'desc' => _("Do you want to confirm deleting entries?")
);
+if (file_exists(dirname(__FILE__) . '/prefs.local.php')) {
-+ require_once(dirname(__FILE__) . '/prefs.local.php');
++ require(dirname(__FILE__) . '/prefs.local.php');
+}
+
diff --git a/horde-webmail/nag/config/conf.php b/horde-webmail/nag/config/conf.php
@@ -518,7 +518,7 @@ index 7809067..a0396f7 100644
$conf['menu']['apps'] = array();
/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
+if (file_exists(dirname(__FILE__) . '/conf.local.php')) {
-+ require_once(dirname(__FILE__) . '/conf.local.php');
++ require(dirname(__FILE__) . '/conf.local.php');
+}
+
diff --git a/horde-webmail/nag/config/menu.php b/horde-webmail/nag/config/menu.php
@@ -530,7 +530,7 @@ index 162c88c..457a10d 100644
/* Add your custom entries below this line. */
+if (file_exists(dirname(__FILE__) . '/menu.local.php')) {
-+ require_once(dirname(__FILE__) . '/menu.local.php');
++ require(dirname(__FILE__) . '/menu.local.php');
+}
+
diff --git a/horde-webmail/nag/config/prefs.php b/horde-webmail/nag/config/prefs.php
@@ -542,7 +542,7 @@ index e14bd8a..bf2d841 100644
'type' => 'implicit',
);
+if (file_exists(dirname(__FILE__) . '/prefs.local.php')) {
-+ require_once(dirname(__FILE__) . '/prefs.local.php');
++ require(dirname(__FILE__) . '/prefs.local.php');
+}
+
diff --git a/horde-webmail/turba/config/attributes.php b/horde-webmail/turba/config/attributes.php
@@ -554,7 +554,7 @@ index ce124f0..adec673 100644
'required' => false,
);
+if (file_exists(dirname(__FILE__) . '/attributes.local.php')) {
-+ require_once(dirname(__FILE__) . '/attributes.local.php');
++ require(dirname(__FILE__) . '/attributes.local.php');
+}
+
diff --git a/horde-webmail/turba/config/conf.php b/horde-webmail/turba/config/conf.php
@@ -566,7 +566,7 @@ index b83f681..8f00f61 100644
$conf['documents']['type'] = 'horde';
/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
+if (file_exists(dirname(__FILE__) . '/conf.local.php')) {
-+ require_once(dirname(__FILE__) . '/conf.local.php');
++ require(dirname(__FILE__) . '/conf.local.php');
+}
+
diff --git a/horde-webmail/turba/config/hooks.php b/horde-webmail/turba/config/hooks.php
@@ -578,7 +578,7 @@ index b7d0d40..d423897 100644
// }
// }
+if (file_exists(dirname(__FILE__) . '/hooks.local.php')) {
-+ require_once(dirname(__FILE__) . '/hooks.local.php');
++ require(dirname(__FILE__) . '/hooks.local.php');
+}
+
diff --git a/horde-webmail/turba/config/menu.php b/horde-webmail/turba/config/menu.php
@@ -590,7 +590,7 @@ index 418a4b3..49022bf 100644
/* Add your custom entries below this line. */
+if (file_exists(dirname(__FILE__) . '/menu.local.php')) {
-+ require_once(dirname(__FILE__) . '/menu.local.php');
++ require(dirname(__FILE__) . '/menu.local.php');
+}
+
diff --git a/horde-webmail/turba/config/mime_drivers.php b/horde-webmail/turba/config/mime_drivers.php
@@ -602,7 +602,7 @@ index 729ca75..7395c13 100644
* the format.
*/
+if (file_exists(dirname(__FILE__) . '/mime_drivers.local.php')) {
-+ require_once(dirname(__FILE__) . '/mime_drivers.local.php');
++ require(dirname(__FILE__) . '/mime_drivers.local.php');
+}
+
diff --git a/horde-webmail/turba/config/prefs.php b/horde-webmail/turba/config/prefs.php
@@ -614,7 +614,7 @@ index 2f7c7c3..c2d74f5 100644
'type' => 'implicit'
);
+if (file_exists(dirname(__FILE__) . '/prefs.local.php')) {
-+ require_once(dirname(__FILE__) . '/prefs.local.php');
++ require(dirname(__FILE__) . '/prefs.local.php');
+}
+
diff --git a/horde-webmail/turba/config/sources.php b/horde-webmail/turba/config/sources.php
@@ -626,7 +626,7 @@ index 083defe..d6acb36 100644
'browse' => true,
);
+if (file_exists(dirname(__FILE__) . '/sources.local.php')) {
-+ require_once(dirname(__FILE__) . '/sources.local.php');
++ require(dirname(__FILE__) . '/sources.local.php');
+}
+
--