holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix typo, rework of link to preferences and link to emailadmin, fix for sidebar reload via xajax/json

Browse Source
This commit is contained in:
Klaus Leithoff 2010-11-23 15:00:19 +00:00
parent ef5fe2728a
commit 3a3c6f624a
2 changed files with 50 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
felamimail/inc/class.felamimail_hooks.inc.php
View File

@ -479,8 +479,11 @@ class felamimail_hooks
$bofelamimail =& CreateObject('felamimail.bofelamimail',$GLOBALS['egw']->translation->charset());
$preferences = $bofelamimail->mailPreferences;
$showMainScreenStuff = false;
if($_GET['menuaction'] == 'felamimail.uifelamimail.viewMainScreen' ||
$_GET['menuaction'] == 'felamimail.uifelamimail.changeFolder') {
if(($_GET['menuaction'] == 'felamimail.uifelamimail.viewMainScreen' ||
$_GET['menuaction'] == 'felamimail.uifelamimail.changeFolder' ||
stripos($_GET['menuaction'],'ajax_sidebox') !== false) &&
$_GET['menuaction'] != 'felamimail.uifelamimail.redirectToPreferences' &&
$_GET['menuaction'] != 'felamimail.uifelamimail.redirectToEmailadmin') {
/* seems to be, its not needed here, as viewMainScreen does it anyway
$GLOBALS['egw']->js->validate_file('dhtmlxtree','js/dhtmlXCommon');
$GLOBALS['egw']->js->validate_file('dhtmlxtree','js/dhtmlXTree');
@ -691,7 +694,8 @@ class felamimail_hooks
#$mailPreferences = ExecMethod('felamimail.bopreferences.getPreferences');
$menu_title = lang('Preferences');
$file = array(
'Preferences' => egw::link('/index.php','menuaction=preferences.uisettings.index&appname=felamimail'),
//'Preferences' => egw::link('/index.php','menuaction=preferences.uisettings.index&appname=felamimail'),
'Preferences' => egw::link('/index.php','menuaction=felamimail.uifelamimail.redirectToPreferences&appname=felamimail'),
);
if($preferences->userDefinedAccounts || $preferences->userDefinedIdentities) {
@ -759,7 +763,8 @@ class felamimail_hooks
if ($GLOBALS['egw_info']['user']['apps']['admin'])
{
$file = Array(
'Site Configuration' => egw::link('/index.php','menuaction=emailadmin.emailadmin_ui.index'),
//'Site Configuration' => egw::link('/index.php','menuaction=emailadmin.emailadmin_ui.index'),
'Site Configuration' => egw::link('/index.php','menuaction=felamimail.uifelamimail.redirectToEmailadmin'),
);
display_sidebox($appname,lang('Admin'),$file);
}

96
felamimail/inc/class.uifelamimail.inc.php
View File

@ -24,10 +24,11 @@
'compressFolder' => True,
'importMessage' => True,
'deleteMessage' => True,
'handleButtons' => True,
'hookAdmin' => True,
'toggleFilter' => True,
'viewMainScreen' => True
'viewMainScreen' => True,
'redirectToPreferences' => True,
'redirectToEmailadmin' => True,
);
var $mailbox; // the current folder in use
@ -84,6 +85,33 @@
#print __LINE__ . ': ' . (microtime(true) - $this->timeCounter) . '<br>';
}
function redirectToPreferences ()
{
$this->display_app_header();
//appname is a $_GET parameter, so the passing as function parameter does not work
ExecMethod('preferences.uisettings.index',array('appname'=>'felamimail'));
exit;
}
function redirectToEmailadmin ()
{
//$GLOBALS['egw_info']['flags']['currentapp'] = 'emailadmin';
$this->display_app_header(false);
if (!file_exists(EGW_SERVER_ROOT.($et_css_file ='/etemplate/templates/'.$GLOBALS['egw_info']['user']['preferences']['common']['template_set'].'/app.css')))
{
$et_css_file = '/etemplate/templates/default/app.css';
}
echo '
<style type="text/css">
<!--
@import url('.$GLOBALS['egw_info']['server']['webserver_url'].$et_css_file.');
-->
</style>';
ExecMethod2('emailadmin.emailadmin_ui.index');
exit;
}
function addVcard()
{
error_log(__METHOD__." called from:".function_backtrace());
@ -307,62 +335,20 @@
window.close();</script>";
}
function display_app_header()
function display_app_header($includeFMStuff=true)
{
#$GLOBALS['egw']->js->validate_file('foldertree','foldertree');
$GLOBALS['egw']->js->validate_file('dhtmlxtree','js/dhtmlXCommon');
$GLOBALS['egw']->js->validate_file('dhtmlxtree','js/dhtmlXTree');
$GLOBALS['egw']->js->validate_file('jscode','viewMainScreen','felamimail');
$GLOBALS['egw_info']['flags']['include_xajax'] = True;
if ($includeFMStuff)
{
// this call loads js and css for the treeobject
html::tree(false,false,false,null,'foldertree','','',false,'/',null,false);
egw_framework::validate_file('jscode','viewMainScreen','felamimail');
$GLOBALS['egw_info']['flags']['include_xajax'] = True;
}
$GLOBALS['egw']->common->egw_header();
echo parse_navbar();
}
echo $GLOBALS['egw']->framework->navbar();
}
function handleButtons()
{
error_log(__METHOD__." called from:".function_backtrace());
if($this->moveNeeded == "1")
{
$this->bofelamimail->moveMessages($_POST["mailbox"],
$_POST["msg"]);
}
elseif(!empty($_POST["mark_deleted"]) &&
is_array($_POST["msg"]))
{
$this->bofelamimail->deleteMessages($_POST["msg"]);
}
elseif(!empty($_POST["mark_unread"]) &&
is_array($_POST["msg"]))
{
$this->bofelamimail->flagMessages("unread",$_POST["msg"]);
}
elseif(!empty($_POST["mark_read"]) &&
is_array($_POST["msg"]))
{
$this->bofelamimail->flagMessages("read",$_POST["msg"]);
}
elseif(!empty($_POST["mark_unflagged"]) &&
is_array($_POST["msg"]))
{
$this->bofelamimail->flagMessages("unflagged",$_POST["msg"]);
}
elseif(!empty($_POST["mark_flagged"]) &&
is_array($_POST["msg"]))
{
$this->bofelamimail->flagMessages("flagged",$_POST["msg"]);
}
$this->viewMainScreen();
}
function hookAdmin()
{
if(!$GLOBALS['egw']->acl->check('run',1,'admin'))