mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-08 00:54:50 +01:00
fix for bug/FeatureRequest #2218 missing return before check_data with the compose FormIt was removed with rev.26620 for puroses not reconstructable to me anymore; Also removing some =& for the Creation of Objects; putting the FoldreTree JavaScript in an extra div as it should not hurt, and I suspect the missing of the former, to be one of the reasons for the removal of the return, as I was experiencing problems with the folder tree eventhandler and the submit
This commit is contained in:
parent
282401919a
commit
5ac6a0c1a7
@ -52,7 +52,7 @@
|
||||
*/
|
||||
function uiwidgets()
|
||||
{
|
||||
$template =& CreateObject('phpgwapi.Template',EGW_APP_TPL);
|
||||
$template = CreateObject('phpgwapi.Template',EGW_APP_TPL);
|
||||
$this->template = $template;
|
||||
$this->template->set_file(array("body" => 'uiwidgets.tpl'));
|
||||
$this->charset = $GLOBALS['egw']->translation->charset();
|
||||
@ -109,7 +109,7 @@
|
||||
$folderImageDir = $GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/templates/default/images/';
|
||||
|
||||
// careful! "d = new..." MUST be on a new line!!!
|
||||
$folder_tree_new = '<link rel="STYLESHEET" type="text/css" href="'.$GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/js/dhtmlxtree/css/dhtmlXTree.css">';
|
||||
$folder_tree_new = '<div><link rel="STYLESHEET" type="text/css" href="'.$GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/js/dhtmlxtree/css/dhtmlXTree.css">';
|
||||
$folder_tree_new .= "<script type='text/javascript'>";
|
||||
$folder_tree_new .= "tree=new dhtmlXTreeObject('$_divName','100%','100%',0);";
|
||||
$folder_tree_new .= "tree.setImagePath('$folderImageDir/dhtmlxtree/');";
|
||||
@ -190,7 +190,7 @@
|
||||
$selected = @htmlspecialchars($_selected, ENT_QUOTES, $this->charset);
|
||||
#$selected = base64_encode($_selected);
|
||||
|
||||
$folder_tree_new.= "tree.closeAllItems(0);tree.openItem('$selected');</script>";
|
||||
$folder_tree_new.= "tree.closeAllItems(0);tree.openItem('$selected');</script></div>";
|
||||
|
||||
return $folder_tree_new;
|
||||
}
|
||||
@ -248,7 +248,7 @@
|
||||
// $_rowStyle felamimail or outlook
|
||||
function messageTable($_headers, $_folderType, $_folderName, $_readInNewWindow, $_rowStyle='felamimail')
|
||||
{
|
||||
$this->t =& CreateObject('phpgwapi.Template',EGW_APP_TPL);
|
||||
$this->t = CreateObject('phpgwapi.Template',EGW_APP_TPL);
|
||||
$this->t->set_file(array("body" => 'mainscreen.tpl'));
|
||||
$this->t->set_block('body','header_row_felamimail');
|
||||
$this->t->set_block('body','header_row_outlook');
|
||||
@ -613,7 +613,7 @@
|
||||
|
||||
function quotaDisplay($_usage, $_limit)
|
||||
{
|
||||
$this->t =& CreateObject('phpgwapi.Template',EGW_APP_TPL);
|
||||
$this->t = CreateObject('phpgwapi.Template',EGW_APP_TPL);
|
||||
$this->t->set_file(array("body" => 'mainscreen.tpl'));
|
||||
$this->t->set_block('body','quota_block');
|
||||
|
||||
|
@ -41,7 +41,7 @@
|
||||
}
|
||||
</script>
|
||||
<center>
|
||||
<form method="post" name="doit" action="{link_action}" ENCTYPE="multipart/form-data" onsubmit="check_data();">
|
||||
<form method="post" name="doit" action="{link_action}" ENCTYPE="multipart/form-data" onsubmit="return check_data();">
|
||||
<input type="hidden" id="saveAsDraft" name="saveAsDraft" value="0">
|
||||
<input type="hidden" id="printit" name="printit" value="0">
|
||||
<TABLE WIDTH="99%" CELLPADDING="1" CELLSPACING="0" style="border: solid #aaaaaa 1px; border-right: solid black 1px; border-bottom: solid black 1px;">
|
||||
|
Loading…
Reference in New Issue
Block a user