mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-07 16:44:07 +01:00
fix bug regarding the CKEditor view of Main/Loginscreenmessages
This commit is contained in:
parent
419516c011
commit
4e1f3f31e5
@ -20,7 +20,6 @@
|
|||||||
$section = $_POST['section'];
|
$section = $_POST['section'];
|
||||||
$select_lang = $_POST['select_lang'];
|
$select_lang = $_POST['select_lang'];
|
||||||
$message = get_magic_quotes_gpc() ? stripslashes($_POST['message']) : $_POST['message'];
|
$message = get_magic_quotes_gpc() ? stripslashes($_POST['message']) : $_POST['message'];
|
||||||
|
|
||||||
$acl_ok = array();
|
$acl_ok = array();
|
||||||
if (!$GLOBALS['egw']->acl->check('mainscreen_message_access',1,'admin'))
|
if (!$GLOBALS['egw']->acl->check('mainscreen_message_access',1,'admin'))
|
||||||
{
|
{
|
||||||
@ -36,6 +35,8 @@
|
|||||||
$GLOBALS['egw']->redirect_link('/admin/index.php');
|
$GLOBALS['egw']->redirect_link('/admin/index.php');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
egw_framework::validate_file('ckeditor3','ckeditor','phpgwapi');
|
||||||
|
|
||||||
$GLOBALS['egw']->template->set_file(array('message' => 'mainscreen_message.tpl'));
|
$GLOBALS['egw']->template->set_file(array('message' => 'mainscreen_message.tpl'));
|
||||||
$GLOBALS['egw']->template->set_block('message','form','form');
|
$GLOBALS['egw']->template->set_block('message','form','form');
|
||||||
$GLOBALS['egw']->template->set_block('message','row','row');
|
$GLOBALS['egw']->template->set_block('message','row','row');
|
||||||
@ -127,8 +128,7 @@
|
|||||||
$htmlarea_button='<input type="submit" name="htmlarea" onclick="self.location.href=\''.
|
$htmlarea_button='<input type="submit" name="htmlarea" onclick="self.location.href=\''.
|
||||||
$GLOBALS['egw']->link('/index.php','menuaction=admin.uimainscreen.index&htmlarea=true').'\'" value="'.
|
$GLOBALS['egw']->link('/index.php','menuaction=admin.uimainscreen.index&htmlarea=true').'\'" value="'.
|
||||||
lang('activate WYSIWYG-editor').'">';
|
lang('activate WYSIWYG-editor').'">';
|
||||||
|
}
|
||||||
}
|
|
||||||
$GLOBALS['egw']->common->egw_header();
|
$GLOBALS['egw']->common->egw_header();
|
||||||
echo parse_navbar();
|
echo parse_navbar();
|
||||||
|
|
||||||
@ -158,7 +158,7 @@
|
|||||||
|
|
||||||
$GLOBALS['egw']->template->set_var('lang_cancel',lang('Cancel'));
|
$GLOBALS['egw']->template->set_var('lang_cancel',lang('Cancel'));
|
||||||
$GLOBALS['egw']->template->set_var('error_message',$feedback_message);
|
$GLOBALS['egw']->template->set_var('error_message',$feedback_message);
|
||||||
$GLOBALS['egw']->template->pfp('out','form');
|
$GLOBALS['egw']->template->pparse('out','form');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
Loading…
Reference in New Issue
Block a user