gunnar: server/patches/horde-webmail/1.2.0/tg t_GLOBAL_HK_GW_ConfigTemplateSupport.diff, 1.1.2.1, 1.1.2.2
cvs at kolab.org
cvs at kolab.org
Wed May 13 12:05:05 CEST 2009
Author: gunnar
Update of /kolabrepository/server/patches/horde-webmail/1.2.0/tg
In directory doto:/tmp/cvs-serv23210/patches/horde-webmail/1.2.0/tg
Modified Files:
Tag: kolab_2_2_branch
t_GLOBAL_HK_GW_ConfigTemplateSupport.diff
Log Message:
kolab/issue3420 (web client prefs and hooks should be configurable
via templates)
Index: t_GLOBAL_HK_GW_ConfigTemplateSupport.diff
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/tg/Attic/t_GLOBAL_HK_GW_ConfigTemplateSupport.diff,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- t_GLOBAL_HK_GW_ConfigTemplateSupport.diff 26 Mar 2009 21:31:00 -0000 1.1.2.1
+++ t_GLOBAL_HK_GW_ConfigTemplateSupport.diff 13 May 2009 10:05:03 -0000 1.1.2.2
@@ -13,7 +13,7 @@
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 @@
}
}*/
+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 @@
)
);
+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 @@
+<?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 @@
$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 @@
);
// 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 @@
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 @@
$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 @@
// }
// }
+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 @@
// '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 @@
'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 @@
'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 @@
);
}
+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 @@
$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 @@
/* 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 @@
}
}
+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 @@
/* 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 @@
)
);
+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 @@
// 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 @@
'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 @@
);
}
+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 @@
'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 @@
);
}
+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 @@
$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 @@
)
);
+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 @@
// }
// }
+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 @@
'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 @@
$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 @@
/* 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 @@
'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 @@
$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 @@
/* 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 @@
)
);
+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 @@
// 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 @@
$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 @@
'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 @@
$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 @@
/* 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 @@
'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 @@
'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 @@
$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 @@
// }
// }
+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 @@
/* 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 @@
* 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 @@
'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 @@
'browse' => true,
);
+if (file_exists(dirname(__FILE__) . '/sources.local.php')) {
-+ require_once(dirname(__FILE__) . '/sources.local.php');
++ require(dirname(__FILE__) . '/sources.local.php');
+}
+
--
More information about the commits
mailing list