diff options
author | Andreas Gohr <andi@splitbrain.org> | 2012-04-20 21:44:48 +0200 |
---|---|---|
committer | Andreas Gohr <andi@splitbrain.org> | 2012-04-20 21:44:48 +0200 |
commit | 73d2d14ce0b465ec7117c8dc6ab39a59f6ed7b5a (patch) | |
tree | 6f051c557dd65b39b71a77e47dca695d31c9c4df /lib | |
parent | f64856ce8e8057c67c211aadd41ff22ec10f2bb0 (diff) | |
parent | 8a803cae76e430dc0f358986db3420ef45049370 (diff) | |
download | rpg-73d2d14ce0b465ec7117c8dc6ab39a59f6ed7b5a.tar.gz rpg-73d2d14ce0b465ec7117c8dc6ab39a59f6ed7b5a.tar.bz2 |
Merge branch 'master' into phpunit
* master: (29 commits)
some edge case checking in search result highlighting
Resolve empty page ID to configured start page
Added more detail error code for unauthorized calls in xmlrpc interface.
changed internal Mailer members from private to protected
made it possible to disable HTML mails in the config
removed commented code left from the quoted_printable days
add missing table tags for HTML diff mails
fixed subscriber mail signatures
use real HRs in HTML mails
Add various headers to the mails FS#2247. pull request #83 closed
removed footer image from HTML mails
use inlinestyles for diffs in HTML mails
fixed signature stripping
fixed mailprefix handling
fixed missing replacement for HTML notify mails
allow image embeds in HTML mail templates
Added HTML wrapper for mails
allow non-txt extensions when accessing locales
added Mailer class to autoloader
Replaced mail_send calls with new Mailer class
...
Diffstat (limited to 'lib')
-rw-r--r-- | lib/exe/xmlrpc.php | 3 | ||||
-rw-r--r-- | lib/plugins/config/lang/en/lang.php | 1 | ||||
-rw-r--r-- | lib/plugins/config/settings/config.metadata.php | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index cf3682f11..5e6c197d0 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -30,10 +30,11 @@ class dokuwiki_xmlrpc_server extends IXR_Server { } catch (RemoteAccessDeniedException $e) { if (!isset($_SERVER['REMOTE_USER'])) { header('HTTP/1.1 401 Unauthorized'); + return new IXR_Error(-32603, "server error. not authorized to call method $methodname"); } else { header('HTTP/1.1 403 Forbidden'); + return new IXR_Error(-32604, "server error. forbidden to call the method $methodname"); } - return new IXR_Error(-32603, "server error. not authorized to call method $methodname"); } catch (RemoteException $e) { return new IXR_Error($e->getCode(), $e->getMessage()); } diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 42f34de74..d588e02f8 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -147,6 +147,7 @@ $lang['notify'] = 'Always send change notifications to this email address'; $lang['registernotify'] = 'Always send info on newly registered users to this email address'; $lang['mailfrom'] = 'Sender email address to use for automatic mails'; $lang['mailprefix'] = 'Email subject prefix to use for automatic mails. Leave blank to use the wiki title'; +$lang['htmlmail'] = 'Send better looking, but larger in size HTML multipart emails. Disable for plain text only mails.'; /* Syndication Settings */ $lang['sitemap'] = 'Generate Google sitemap this often (in days). 0 to disable'; diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index e610ac4d4..997495b2e 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -177,6 +177,7 @@ $meta['notify'] = array('email', '_multiple' => true); $meta['registernotify'] = array('email'); $meta['mailfrom'] = array('richemail'); $meta['mailprefix'] = array('string'); +$meta['htmlmail'] = array('onoff'); $meta['_syndication'] = array('fieldset'); $meta['sitemap'] = array('numeric'); |