extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 00:58:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

no more need for default type "popup"

Browse Source
This commit is contained in:
Ralf Becker 2013-07-20 13:46:17 +00:00
parent 74cb73d2d2
commit 99921a823a
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mail/inc/class.mail_ui.inc.php
View File

@ -265,17 +265,14 @@ class mail_ui
// Tree does support this one // Tree does support this one
'add' => array( 'add' => array(
'caption' => 'Add Folder', 'caption' => 'Add Folder',
'type' => 'popup',
'onExecute' => 'javaScript:app.mail.mail_AddFolder' 'onExecute' => 'javaScript:app.mail.mail_AddFolder'
), ),
'rename' => array( 'edit' => array(
'caption' => 'Rename Folder', 'caption' => 'Rename Folder',
'type' => 'popup',
'onExecute' => 'javaScript:app.mail.mail_RenameFolder' 'onExecute' => 'javaScript:app.mail.mail_RenameFolder'
), ),
'delete' => array( 'delete' => array(
'caption' => 'Delete Folder', 'caption' => 'Delete Folder',
'type' => 'popup',
'onExecute' => 'javaScript:app.mail.mail_DeleteFolder' 'onExecute' => 'javaScript:app.mail.mail_DeleteFolder'
) )
)); ));
@ -649,7 +646,7 @@ class mail_ui
$parent = implode(self::$delimiter, $parents); $parent = implode(self::$delimiter, $parents);
if ($parent) $parent .= self::$delimiter; if ($parent) $parent .= self::$delimiter;
} }
if (!is_array($insert) || !isset($insert['item'])) if (!is_array($insert) || !isset($insert['item']))
{ {
// throwing an exeption here seems to be unrecoverable, even if the cause is a something that can be handeled by the mailserver // throwing an exeption here seems to be unrecoverable, even if the cause is a something that can be handeled by the mailserver
@ -1640,7 +1637,7 @@ unset($query['actions']);
+ $field_data; + $field_data;
} }
} }
if (empty($subject)) $subject = lang('no subject'); if (empty($subject)) $subject = lang('no subject');
$content['msg'] = (is_array($error_msg)?implode("<br>",$error_msg):$error_msg); $content['msg'] = (is_array($error_msg)?implode("<br>",$error_msg):$error_msg);
$content['mail_displaydate'] = mail_bo::_strtotime($headers['DATE'],'ts',true); $content['mail_displaydate'] = mail_bo::_strtotime($headers['DATE'],'ts',true);
@ -2523,7 +2520,7 @@ blockquote[type=cite] {
function image_callback($matches) function image_callback($matches)
{ {
static $cache = array(); // some caching, if mails containing the same image multiple times static $cache = array(); // some caching, if mails containing the same image multiple times
$linkData = array ( $linkData = array (
'menuaction' => 'mail.mail_ui.displayImage', 'menuaction' => 'mail.mail_ui.displayImage',
'uid' => $this->uid, 'uid' => $this->uid,