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

not calling CreateObject if class-file does not exist

Browse Source
This commit is contained in:
Ralf Becker 2005-03-07 21:58:15 +00:00
parent c2bf8d30af
commit 3435f58d39
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
etemplate/inc/class.editor.inc.php
View File

@ -94,7 +94,7 @@
function editor() function editor()
{ {
$this->etemplate = CreateObject('etemplate.etemplate'); $this->etemplate =& CreateObject('etemplate.etemplate');
$this->extensions = $GLOBALS['phpgw']->session->appsession('extensions','etemplate'); $this->extensions = $GLOBALS['phpgw']->session->appsession('extensions','etemplate');
} }
@ -491,14 +491,13 @@
} }
else // try to call the writeLangFile function of the app's ui-layer else // try to call the writeLangFile function of the app's ui-layer
{ {
$ui = @CreateObject($name.'.'.($class = 'ui'.$name)); foreach(array('ui'.$name,'ui',$name,'bo'.$name) as $class)
if (!is_object($ui))
{ {
$ui = @CreateObject($name.'.'.($class = 'ui')); if (file_exists(EGW_INCLUDE_ROOT.'/'.$name.'/inc/class.'.$class.'.inc.php') &&
} ($ui =& CreateObject($name.'.'.$class)) && is_object($ui))
if (!is_object($ui)) {
{ break;
$ui = @CreateObject($name.'.'.($class = $name)); }
} }
if (is_object($ui) && @$ui->public_functions['writeLangFile']) if (is_object($ui) && @$ui->public_functions['writeLangFile'])
{ {
@ -538,7 +537,7 @@
if (!is_object($this->etemplate->xul_io)) if (!is_object($this->etemplate->xul_io))
{ {
$this->etemplate->xul_io = CreateObject('etemplate.xul_io'); $this->etemplate->xul_io =& CreateObject('etemplate.xul_io');
} }
$xml = $this->etemplate->xul_io->export($this->etemplate); $xml = $this->etemplate->xul_io->export($this->etemplate);
@ -577,7 +576,7 @@
} }
if (!is_object($this->etemplate->xul_io)) if (!is_object($this->etemplate->xul_io))
{ {
$this->etemplate->xul_io = CreateObject('etemplate.xul_io'); $this->etemplate->xul_io =& CreateObject('etemplate.xul_io');
} }
$xml = $this->etemplate->xul_io->export($this->etemplate); $xml = $this->etemplate->xul_io->export($this->etemplate);
@ -598,7 +597,7 @@
if (!is_object($this->etemplate->xul_io)) if (!is_object($this->etemplate->xul_io))
{ {
$this->etemplate->xul_io = CreateObject('etemplate.xul_io'); $this->etemplate->xul_io =& CreateObject('etemplate.xul_io');
} }
$imported = $this->etemplate->xul_io->import($this->etemplate,$xml); $imported = $this->etemplate->xul_io->import($this->etemplate,$xml);
$this->etemplate->modified = @filemtime($f); $this->etemplate->modified = @filemtime($f);
@ -914,14 +913,13 @@
} }
else // try to call the writeLangFile function of the app's ui-layer else // try to call the writeLangFile function of the app's ui-layer
{ {
$ui = @CreateObject($app.'.'.($class = 'ui'.$app)); foreach(array('ui'.$name,'ui',$name,'bo'.$name) as $class)
if (!is_object($ui))
{ {
$ui = @CreateObject($app.'.'.($class = 'ui')); if (file_exists(EGW_INCLUDE_ROOT.'/'.$name.'/inc/class.'.$class.'.inc.php') &&
} ($ui =& CreateObject($name.'.'.$class)) && is_object($ui))
if (!is_object($ui)) {
{ break;
$ui = @CreateObject($app.'.'.($class = $app)); }
} }
if (is_object($ui) && @$ui->public_functions['writeLangFile']) if (is_object($ui) && @$ui->public_functions['writeLangFile'])
{ {
@ -1018,7 +1016,7 @@
// create the needed cells, if they dont exist // create the needed cells, if they dont exist
for ($n = 1; $n <= (int) $widget['size']; ++$n) for ($n = 1; $n <= (int) $widget['size']; ++$n)
{ {
if (!is_array($widget[$n])) $widget[$n] = soetemplate::empty_cell(); if (!is_array($widget[$n])) $widget[$n] = $n == 1 ? $old : soetemplate::empty_cell();
} }
} }
return; // no change necessary, eg. between different box-types return; // no change necessary, eg. between different box-types