[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: etemplate/inc class.editor.inc.php,1.29,1.30
|
From: |
Ralf Becker <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: etemplate/inc class.editor.inc.php,1.29,1.30 |
|
Date: |
Sat, 19 Oct 2002 07:03:05 -0400 |
Update of /cvsroot/phpgroupware/etemplate/inc
In directory subversions:/tmp/cvs-serv14496
Modified Files:
class.editor.inc.php
Log Message:
- improved caching of extensions (previously a reload was made if
delete/show/list was called)
- call the writeLangFile function of the apps ui-layer if it exists
Index: class.editor.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.editor.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** class.editor.inc.php 17 Oct 2002 22:05:53 -0000 1.29
--- class.editor.inc.php 19 Oct 2002 11:03:00 -0000 1.30
***************
*** 31,35 ****
'exported' => "eTemplate '%s' written to '%s'",
'newer_version' => "newer version '%s' exists !!!",
! 'need_name' => 'Application name needed to write a
langfile !!!'
);
var $aligns = array(
--- 31,35 ----
'exported' => "eTemplate '%s' written to '%s'",
'newer_version' => "newer version '%s' exists !!!",
! 'need_name' => 'Application name needed to write a
langfile or dump the eTemplates !!!'
);
var $aligns = array(
***************
*** 87,91 ****
$msg .= $this->messages['not_found'];
}
! if ($this->extensions == '')
{
$this->extensions =
$this->scan_for_extensions();
--- 87,91 ----
$msg .= $this->messages['not_found'];
}
! if (!is_array($this->extensions))
{
$this->extensions =
$this->scan_for_extensions();
***************
*** 425,429 ****
elseif ($content['dump'])
{
! $msg =
$this->etemplate->dump2setup($content['name']);
}
elseif ($content['save'])
--- 425,437 ----
elseif ($content['dump'])
{
! list($name) = explode('.',$content['name']);
! if (empty($name) ||
address@hidden(PHPGW_SERVER_ROOT.'/'.$name))
! {
! $msg = $this->messages['need_name'];
! }
! else
! {
! $msg =
$this->etemplate->dump2setup($content['name']);
! }
}
elseif ($content['save'])
***************
*** 456,460 ****
$additional = $m->messages +
$this->etemplate->types + $this->extensions + $this->aligns;
}
! $msg =
$this->etemplate->writeLangFile($name,'en',$additional);
}
}
--- 464,488 ----
$additional = $m->messages +
$this->etemplate->types + $this->extensions + $this->aligns;
}
! else // try to call the
writeLangFile function of the app's ui-layer
! {
! $ui =
@CreateObject($name.'.'.($class = 'ui'.$name));
! if (!is_object($ui))
! {
! $ui =
@CreateObject($name.'.'.($class = 'ui'));
! }
! if (!is_object($ui))
! {
! $ui =
@CreateObject($name.'.'.($class = $name));
! }
! if (is_object($ui) &&
@$ui->public_functions['writeLangFile'])
! {
! $msg =
"$class::writeLangFile: ".$ui->writeLangFile();
! }
! unset($ui);
! }
! if (empty($msg))
! {
! $msg =
$this->etemplate->writeLangFile($name,'en',$additional);
! }
}
}
***************
*** 554,572 ****
}
! function delete($post_vars='',$back = 'edit')
{
if ($this->debug)
{
! echo "delete(back='$back') cont = ";
_debug_array($post_vars);
}
! if (!$post_vars)
{
! $post_vars = array();
}
! if (isset($post_vars['name']))
{
! $read_ok = $this->etemplate->read($post_vars);
}
! if (isset($post_vars['yes'])) // Delete
{
if ($read_ok)
--- 582,604 ----
}
! function delete($content='',$back = 'edit')
{
if ($this->debug)
{
! echo "delete(back='$back') content = ";
_debug_array($content);
}
! if (!is_array($content))
{
! $content = array();
}
! if (!is_array($this->extensions) &&
isset($content['**extensions**']))
{
! $this->extensions = $content['**extensions**'];
unset($content['**extensions**']);
}
! if (isset($content['name']))
! {
! $read_ok = $this->etemplate->read($content);
! }
! if (isset($content['yes'])) // Delete
{
if ($read_ok)
***************
*** 576,582 ****
$msg = $this->messages[$read_ok ? 'deleted' :
'not_found'];
! if ($post_vars['back'] == 'list_result')
{
!
$this->list_result($post_vars['preserv'],$msg);
}
else
--- 608,614 ----
$msg = $this->messages[$read_ok ? 'deleted' :
'not_found'];
! if ($content['back'] == 'list_result')
{
!
$this->list_result($content['preserv'],$msg);
}
else
***************
*** 586,595 ****
return;
}
! if (isset($post_vars['no'])) // Back to ...
{
! switch ($back = $post_vars['back'])
{
case 'list_result':
!
$this->$back($post_vars['preserv']);
return;
case 'show':
--- 618,627 ----
return;
}
! if (isset($content['no'])) // Back to ...
{
! switch ($back = $content['back'])
{
case 'list_result':
!
$this->$back($content['preserv']);
return;
case 'show':
***************
*** 606,616 ****
return;
}
$content = $this->etemplate->as_array();
$delete = new etemplate('etemplate.editor.delete');
!
$delete->exec('etemplate.editor.delete',$content,array(),array(),$content+
array(
! 'back' => $back,
! 'preserv' => $post_vars['preserv']
! ),'');
}
--- 638,652 ----
return;
}
+ $preserv = array(
+ 'preserv' => $content['preserv'],
+ 'back' => $back
+ );
$content = $this->etemplate->as_array();
$delete = new etemplate('etemplate.editor.delete');
!
$delete->exec('etemplate.editor.delete',$content,array(),array(),
! $content+$preserv+array(
! '**extensions**' => $this->extensions
! ),'');
}
***************
*** 621,624 ****
--- 657,664 ----
echo "<p>etemplate.editor.list_result: cont=";
_debug_array($cont);
}
+ if (!is_array($this->extensions) && is_array($cont) &&
isset($cont['**extensions**']))
+ {
+ $this->extensions = $cont['**extensions**'];
unset($cont['**extensions**']);
+ }
if (!$cont || !is_array($cont))
{
***************
*** 667,671 ****
$list_result = new
etemplate('etemplate.editor.list_result');
//$list_result->debug=1;
!
$list_result->exec('etemplate.editor.list_result',$content,'','',array('result'
=> $result),'');
}
--- 707,714 ----
$list_result = new
etemplate('etemplate.editor.list_result');
//$list_result->debug=1;
!
$list_result->exec('etemplate.editor.list_result',$content,'','',array(
! 'result' => $result,
! '**extensions**' => $this->extensions
! ),'');
}
***************
*** 676,683 ****
echo "<p>etemplate.editor.show: content=";
_debug_array($post_vars);
}
! if (!$post_vars)
{
$post_vars = array();
}
if (isset($GLOBALS['HTTP_GET_VARS']['name']) &&
!$this->etemplate->read($GLOBALS['HTTP_GET_VARS']) ||
isset($post_vars['name']) &&
!$this->etemplate->read($post_vars))
--- 719,730 ----
echo "<p>etemplate.editor.show: content=";
_debug_array($post_vars);
}
! if (!is_array($post_vars))
{
$post_vars = array();
}
+ if (!is_array($this->extensions) &&
isset($post_vars['**extensions**']))
+ {
+ $this->extensions =
$post_vars['**extensions**']; unset($post_vars['**extensions**']);
+ }
if (isset($GLOBALS['HTTP_GET_VARS']['name']) &&
!$this->etemplate->read($GLOBALS['HTTP_GET_VARS']) ||
isset($post_vars['name']) &&
!$this->etemplate->read($post_vars))
***************
*** 736,740 ****
}
}
!
$show->exec('etemplate.editor.show',$content,array(),'',array('olds' =>
$vals),'');
}
--- 783,790 ----
}
}
!
$show->exec('etemplate.editor.show',$content,array(),'',array(
! 'olds' => $vals,
! '**extensions**' => $this->extensions
! ),'');
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: etemplate/inc class.editor.inc.php,1.29,1.30,
Ralf Becker <address@hidden> <=