extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 16:44:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

removed old code used to run etemplate without javascript, not working anymore and causing it now to fail after Nathans changes

Browse Source
This commit is contained in:
Ralf Becker 2013-04-03 08:37:28 +00:00
parent 81752aa4d5
commit ed76aa43e2
2 changed files with 52 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
etemplate/inc/class.date_widget.inc.php
View File

@ -291,7 +291,7 @@ class date_widget
if (!$i && $cell['accesskey']) $dcell['accesskey'] = $cell['accesskey']; if (!$i && $cell['accesskey']) $dcell['accesskey'] = $cell['accesskey'];
// test if we can use jsCalendar // test if we can use jsCalendar
if ($n == 0 && $this->jscal && $tmpl->java_script()) if ($n == 0 && $this->jscal)
{ {
$dcell['type'] = 'html'; $dcell['type'] = 'html';
$dcell['name'] = 'str'; $dcell['name'] = 'str';
@ -326,12 +326,9 @@ class date_widget
$dcell['label'] = 'Today'; $dcell['label'] = 'Today';
$dcell['help'] = 'sets today as date'; $dcell['help'] = 'sets today as date';
$dcell['no_lang'] = True; $dcell['no_lang'] = True;
if (($js = $tmpl->java_script()))
{
$dcell['needed'] = True; // to get a button $dcell['needed'] = True; // to get a button
$dcell['onchange'] = "this.form.elements['$name"."[Y]'].value='".adodb_date('Y')."'; this.form.elements['$name"."[m]'].value='".adodb_date('n')."';this.form.elements['$name"."[d]'].value='".(0+adodb_date('d'))."'; return false;"; $dcell['onchange'] = "this.form.elements['$name"."[Y]'].value='".adodb_date('Y')."'; this.form.elements['$name"."[m]'].value='".adodb_date('n')."';this.form.elements['$name"."[d]'].value='".(0+adodb_date('d'))."'; return false;";
} $dcell['type'] = 'button';
$dcell['type'] = $js ? 'button' : 'checkbox';
$row[$tpl->num2chrs(++$i)] = &$dcell; $row[$tpl->num2chrs(++$i)] = &$dcell;
unset($dcell); unset($dcell);
} }

81
etemplate/inc/class.etemplate_old.inc.php
View File

@ -112,13 +112,6 @@ class etemplate_old extends boetemplate
*/ */
static protected $validation_errors = array(); static protected $validation_errors = array();
/**
* Flag if the browser has javascript enabled
*
* @var boolean
*/
static public $java_script;
/** /**
* Flag if exec() is called as part of a hook, replaces the 1.6 and earlier $GLOBALS['egw_info']['etemplate']['hooked'] global variable * Flag if exec() is called as part of a hook, replaces the 1.6 and earlier $GLOBALS['egw_info']['etemplate']['hooked'] global variable
* *
@ -202,7 +195,6 @@ class etemplate_old extends boetemplate
*/ */
function exec($method,$content,$sel_options='',$readonlys='',$preserv='',$output_mode=0,$ignore_validation='',$changes='') function exec($method,$content,$sel_options='',$readonlys='',$preserv='',$output_mode=0,$ignore_validation='',$changes='')
{ {
//echo "<br>globals[java_script] = '".self::$java_script."', this->java_script() = '".$this->java_script()."'\n";
if (!$sel_options) if (!$sel_options)
{ {
$sel_options = array(); $sel_options = array();
@ -225,7 +217,7 @@ class etemplate_old extends boetemplate
} }
if ($GLOBALS['egw_info']['flags']['currentapp'] != 'etemplate') if ($GLOBALS['egw_info']['flags']['currentapp'] != 'etemplate')
{ {
$GLOBALS['egw']->translation->add_app('etemplate'); // some extensions have own texts translation::add_app('etemplate'); // some extensions have own texts
} }
// use different form-names to allows multiple eTemplates in one page, eg. addressbook-view // use different form-names to allows multiple eTemplates in one page, eg. addressbook-view
self::$name_form = 'eTemplate'; self::$name_form = 'eTemplate';
@ -258,10 +250,8 @@ class etemplate_old extends boetemplate
."<body>\n".$this->show($content)."\n</body>\n</html>"; ."<body>\n".$this->show($content)."\n</body>\n</html>";
} }
$html = $this->include_java_script(1). $html = $this->show(self::complete_array_merge($content,$changes),$sel_options,$readonlys,self::$name_vars);
$this->show(self::complete_array_merge($content,$changes),$sel_options,$readonlys,self::$name_vars);
self::$request->java_script = self::$java_script;
self::$request->java_script_from_flags = $GLOBALS['egw_info']['flags']['java_script']; self::$request->java_script_from_flags = $GLOBALS['egw_info']['flags']['java_script'];
self::$request->java_script_body_tags = array( self::$request->java_script_body_tags = array(
'onload' => egw_framework::set_onload(), 'onload' => egw_framework::set_onload(),
@ -299,29 +289,21 @@ class etemplate_old extends boetemplate
($output_mode != 0 ? '' : ' onsubmit="this.innerWidth.value=window.innerWidth ? window.innerWidth : document.body.clientWidth;"')); ($output_mode != 0 ? '' : ' onsubmit="this.innerWidth.value=window.innerWidth ? window.innerWidth : document.body.clientWidth;"'));
//echo "to_process="; _debug_array(self::$request->to_process); //echo "to_process="; _debug_array(self::$request->to_process);
egw_framework::validate_file('/etemplate/js/etemplate.js');
//echo '<p>'.__METHOD__."($method,...) etemplate[hooked]=".(int)self::$hooked.", etemplate[hook_app]='".self::$hook_app."', isset(etemplate[content])=".(int)isset(self::$previous_content)."</p>\n"; //echo '<p>'.__METHOD__."($method,...) etemplate[hooked]=".(int)self::$hooked.", etemplate[hook_app]='".self::$hook_app."', isset(etemplate[content])=".(int)isset(self::$previous_content)."</p>\n";
if ($this->sitemgr) if (!$this->sitemgr)
{
$GLOBALS['egw_info']['flags']['java_script'] .= $this->include_java_script(2);
}
else
{ {
// support the old global var, in case old apps like 1.6 infolog use it // support the old global var, in case old apps like 1.6 infolog use it
if (isset($GLOBALS['egw_info']['etemplate']['hooked'])) self::$hooked = $GLOBALS['egw_info']['etemplate']['hooked']; if (isset($GLOBALS['egw_info']['etemplate']['hooked'])) self::$hooked = $GLOBALS['egw_info']['etemplate']['hooked'];
if (!@self::$hooked && (int) $output_mode != 1 && (int) $output_mode != -1) // not just returning the html if (!@self::$hooked && (int) $output_mode != 1 && (int) $output_mode != -1) // not just returning the html
{ {
$GLOBALS['egw_info']['flags']['java_script'] .= $this->include_java_script(2);
if ($GLOBALS['egw_info']['flags']['currentapp'] != 'etemplate') if ($GLOBALS['egw_info']['flags']['currentapp'] != 'etemplate')
{ {
egw_framework::includeCSS('etemplate', 'app'); egw_framework::includeCSS('etemplate', 'app');
} }
} }
elseif (!isset(self::$previous_content))
{
$html = $this->include_java_script(2).$html; // better than nothing
}
// saving the etemplate content for other hooked etemplate apps (atm. infolog hooked into addressbook) // saving the etemplate content for other hooked etemplate apps (atm. infolog hooked into addressbook)
self::$previous_content =& $html; self::$previous_content =& $html;
} }
@ -364,7 +346,7 @@ class etemplate_old extends boetemplate
{ {
echo "</div>\n"; echo "</div>\n";
} }
$GLOBALS['egw']->common->egw_footer(); common::egw_footer();
} }
} }
if ($this->sitemgr || (int) $output_mode == 1 || (int) $output_mode == -1) // return html if ($this->sitemgr || (int) $output_mode == 1 || (int) $output_mode == -1) // return html
@ -458,8 +440,6 @@ class etemplate_old extends boetemplate
$content = array(); $content = array();
} }
$this->init(self::$request->template); $this->init(self::$request->template);
self::$java_script = self::$request->java_script || $_POST['java_script'];
//echo "globals[java_script] = '".self::$java_script."', session_data[java_script] = '".self::$request->java_script."', _POST[java_script] = '".$_POST['java_script']."'\n";
//echo "process_exec($this->name) content ="; _debug_array($content); //echo "process_exec($this->name) content ="; _debug_array($content);
if ($GLOBALS['egw_info']['flags']['currentapp'] != 'etemplate') if ($GLOBALS['egw_info']['flags']['currentapp'] != 'etemplate')
{ {
@ -1165,8 +1145,6 @@ class etemplate_old extends boetemplate
$blur = $cell['blur'][0] == '@' ? $this->get_array($content,substr($cell['blur'],1)) : $blur = $cell['blur'][0] == '@' ? $this->get_array($content,substr($cell['blur'],1)) :
(strlen($cell['blur']) <= 1 ? $cell['blur'] : lang($cell['blur'])); (strlen($cell['blur']) <= 1 ? $cell['blur'] : lang($cell['blur']));
if ($this->java_script())
{
if ($blur) if ($blur)
{ {
if ((string)$value === '') if ((string)$value === '')
@ -1219,7 +1197,7 @@ class etemplate_old extends boetemplate
$options .= ' onChange="'.$onchange.'"'; $options .= ' onChange="'.$onchange.'"';
} }
} }
}
if ($form_name != '') if ($form_name != '')
{ {
$options = self::get_id($form_name,$cell['name'],$cell['id']).' '.$options; $options = self::get_id($form_name,$cell['name'],$cell['id']).' '.$options;
@ -1462,7 +1440,7 @@ class etemplate_old extends boetemplate
$onclick = $this->js_pseudo_funcs($onclick,$cname); $onclick = $this->js_pseudo_funcs($onclick,$cname);
} }
unset($cell['onclick']); // otherwise the grid will handle it unset($cell['onclick']); // otherwise the grid will handle it
if ($this->java_script() && ($cell['onchange'] != '' || $img && !$readonly) && !$cell['needed']) // use a link instead of a button if (($cell['onchange'] != '' || $img && !$readonly) && !$cell['needed']) // use a link instead of a button
{ {
$onclick = ($onclick ? preg_replace('/^return(.*);$/','if (\\1) ',$onclick) : ''). $onclick = ($onclick ? preg_replace('/^return(.*);$/','if (\\1) ',$onclick) : '').
(((string)$cell['onchange'] === '1' || $img) ? (((string)$cell['onchange'] === '1' || $img) ?
@ -2468,47 +2446,4 @@ class etemplate_old extends boetemplate
self::$validation_errors[$name] .= $error; self::$validation_errors[$name] .= $error;
} }
} }
/**
* is javascript enabled?
*
* this should be tested by the api at login
*
* @return boolean true if javascript is enabled or not yet tested and $consider_not_tested_as_enabled
*/
function java_script($consider_not_tested_as_enabled = True)
{
$ret = !!self::$java_script ||
$consider_not_tested_as_enabled && !isset(self::$java_script);
//echo "<p>java_script($consider_not_tested_as_enabled)='$ret', java_script='".self::$java_script."', isset(java_script)=".isset(self::$java_script)."</p>\n";
return $ret;
}
/**
* returns the javascript to be included by exec
*
* @param int $what &1 = returns the test, note: has to be included in the body, not the header,
* &2 = returns the common functions, best to be included in the header
* @return string javascript
*/
private function include_java_script($what = 3)
{
// this is to test if javascript is enabled
if ($what & 1 && !isset(self::$java_script))
{
$js = '<script language="javascript">
document.write(\''.str_replace("\n",'',html::input_hidden('java_script','1')).'\');
</script>
';
}
// here are going all the necesarry functions if javascript is enabled
if ($what & 2 && $this->java_script(True))
{
$lastmod = filectime(EGW_INCLUDE_ROOT. '/etemplate/js/etemplate.js');
$js .= '<script type="text/javascript" src="'.
$GLOBALS['egw_info']['server']['webserver_url'].'/etemplate/js/etemplate.js?'. $lastmod.'"></script>'."\n";
}
return $js;
}
} }