gunnar: server/patches/horde-webmail/1.2.0 horde-webmail-1.2.0_kolab_openpkg.patch, 1.32.2.4.2.6, 1.32.2.4.2.7
cvs at kolab.org
cvs at kolab.org
Thu May 14 16:32:17 CEST 2009
Author: gunnar
Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv27212/patches/horde-webmail/1.2.0
Modified Files:
Tag: suc_branch
horde-webmail-1.2.0_kolab_openpkg.patch
Log Message:
MFB (kolab/issue3420 (web client prefs and hooks should be configurable via templates))
Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/Attic/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.32.2.4.2.6
retrieving revision 1.32.2.4.2.7
diff -u -d -r1.32.2.4.2.6 -r1.32.2.4.2.7
--- horde-webmail-1.2.0_kolab_openpkg.patch 24 Apr 2009 17:42:20 -0000 1.32.2.4.2.6
+++ horde-webmail-1.2.0_kolab_openpkg.patch 14 May 2009 14:32:15 -0000 1.32.2.4.2.7
@@ -16090,7 +16090,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
@@ -16166,7 +16166,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
@@ -16178,7 +16178,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
@@ -16191,7 +16191,7 @@
+<?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 @@
$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 @@
);
// 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 @@
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 @@
$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 @@
// }
// }
+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 @@
// '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 @@
'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 @@
'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 @@
);
}
+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 @@
$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 @@
/* 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 @@
}
}
+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 @@
/* 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 @@
)
);
+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 @@
// 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 @@
'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 @@
);
}
+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 @@
'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 @@
);
}
+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 @@
$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 @@
)
);
+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 @@
// }
// }
+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 @@
'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 @@
$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 @@
/* 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 @@
'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 @@
$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 @@
/* 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 @@
)
);
+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 @@
// 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 @@
$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 @@
'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 @@
$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 @@
/* 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 @@
'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 @@
'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 @@
$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 @@
// }
// }
+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 @@
/* 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 @@
* 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 @@
'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 @@
'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