extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 00:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

removed copy of Template object in setup, using the one in the api

Browse Source
This commit is contained in:
Ralf Becker 2007-12-09 08:03:56 +00:00
parent b96ebc16fc
commit fc1ce1fa71
13 changed files with 14 additions and 463 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup/account_migration.php
View File

@ -38,7 +38,7 @@ if (isset($_REQUEST['setup_session']))
session_start(); session_start();
$tpl_root = $GLOBALS['egw_setup']->html->setup_tpl_dir('setup'); $tpl_root = $GLOBALS['egw_setup']->html->setup_tpl_dir('setup');
$setup_tpl = CreateObject('setup.Template',$tpl_root); $setup_tpl = CreateObject('phpgwapi.Template',$tpl_root);
$setup_tpl->set_file(array( $setup_tpl->set_file(array(
'migration' => 'account_migration.tpl', 'migration' => 'account_migration.tpl',
'T_head' => 'head.tpl', 'T_head' => 'head.tpl',

2
setup/admin_account.php
View File

@ -53,7 +53,7 @@
if(!$_POST['submit'] || $error) if(!$_POST['submit'] || $error)
{ {
$tpl_root = $GLOBALS['egw_setup']->html->setup_tpl_dir('setup'); $tpl_root = $GLOBALS['egw_setup']->html->setup_tpl_dir('setup');
$setup_tpl = CreateObject('setup.Template',$tpl_root); $setup_tpl = CreateObject('phpgwapi.Template',$tpl_root);
$setup_tpl->set_file(array( $setup_tpl->set_file(array(
'T_head' => 'head.tpl', 'T_head' => 'head.tpl',
'T_footer' => 'footer.tpl', 'T_footer' => 'footer.tpl',

2
setup/applications.php
View File

@ -39,7 +39,7 @@
// Does not return unless user is authorized // Does not return unless user is authorized
$tpl_root = $GLOBALS['egw_setup']->html->setup_tpl_dir('setup'); $tpl_root = $GLOBALS['egw_setup']->html->setup_tpl_dir('setup');
$setup_tpl = CreateObject('setup.Template',$tpl_root); $setup_tpl = CreateObject('phpgwapi.Template',$tpl_root);
$setup_tpl->set_file(array( $setup_tpl->set_file(array(
'T_head' => 'head.tpl', 'T_head' => 'head.tpl',
'T_footer' => 'footer.tpl', 'T_footer' => 'footer.tpl',

2
setup/applist.php
View File

@ -30,7 +30,7 @@
// Does not return unless user is authorized // Does not return unless user is authorized
$tpl_root = $GLOBALS['phpgw_setup']->html->setup_tpl_dir('setup'); $tpl_root = $GLOBALS['phpgw_setup']->html->setup_tpl_dir('setup');
$setup_tpl = CreateObject('setup.Template',$tpl_root); $setup_tpl = CreateObject('phpgwapi.Template',$tpl_root);
$setup_tpl->set_file(array( $setup_tpl->set_file(array(
'T_head' => 'head.tpl', 'T_head' => 'head.tpl',
'T_footer' => 'footer.tpl' 'T_footer' => 'footer.tpl'

2
setup/check_install.php
View File

@ -704,7 +704,7 @@
if ($run_by_webserver) if ($run_by_webserver)
{ {
$tpl_root = $GLOBALS['egw_setup']->html->setup_tpl_dir('setup'); $tpl_root = $GLOBALS['egw_setup']->html->setup_tpl_dir('setup');
$setup_tpl = CreateObject('setup.Template',$tpl_root); $setup_tpl = CreateObject('phpgwapi.Template',$tpl_root);
$setup_tpl->set_file(array( $setup_tpl->set_file(array(
'T_head' => 'head.tpl', 'T_head' => 'head.tpl',
'T_footer' => 'footer.tpl', 'T_footer' => 'footer.tpl',

4
setup/config.php
View File

@ -31,7 +31,7 @@
} }
$tpl_root = $GLOBALS['egw_setup']->html->setup_tpl_dir('setup'); $tpl_root = $GLOBALS['egw_setup']->html->setup_tpl_dir('setup');
$setup_tpl = CreateObject('setup.Template',$tpl_root); $setup_tpl = CreateObject('phpgwapi.Template',$tpl_root);
$setup_tpl->set_file(array( $setup_tpl->set_file(array(
'T_head' => 'head.tpl', 'T_head' => 'head.tpl',
@ -145,7 +145,7 @@
$GLOBALS['egw']->common =& CreateObject('phpgwapi.common'); $GLOBALS['egw']->common =& CreateObject('phpgwapi.common');
$GLOBALS['egw']->db =& $GLOBALS['egw_setup']->db; $GLOBALS['egw']->db =& $GLOBALS['egw_setup']->db;
$t = CreateObject('setup.Template',$GLOBALS['egw']->common->get_tpl_dir('setup')); $t = CreateObject('phpgwapi.Template',$GLOBALS['egw']->common->get_tpl_dir('setup'));
$t->set_unknowns('keep'); $t->set_unknowns('keep');
$t->set_file(array('config' => 'config.tpl')); $t->set_file(array('config' => 'config.tpl'));

449
setup/inc/class.Template.inc.php
View File

@ -1,449 +0,0 @@
<?php
/**************************************************************************\
* eGroupWare API - Template class *
* (C) Copyright 1999-2000 NetUSE GmbH Kristian Koehntopp *
* ------------------------------------------------------------------------ *
* http://www.egroupware.org/ *
* ------------------------------------------------------------------------ *
* This program is free software; you can redistribute it and/or modify it *
* under the terms of the GNU Lesser General Public License as published *
* by the Free Software Foundation; either version 2.1 of the License, or *
* any later version. *
\**************************************************************************/
/* $Id$ */
class Template
{
var $classname = 'Template';
/* if set, echo assignments */
var $debug = False;
/* $file[handle] = 'filename'; */
var $file = array();
/* relative filenames are relative to this pathname */
var $root = '';
/* $varkeys[key] = 'key'; $varvals[key] = 'value'; */
var $varkeys = array();
var $varvals = array();
/* 'remove' => remove undefined variables
* 'comment' => replace undefined variables with comments
* 'keep' => keep undefined variables
*/
var $unknowns = 'remove';
/* 'yes' => halt, 'report' => report error, continue, 'no' => ignore error quietly */
var $halt_on_error = 'yes';
/* last error message is retained here */
var $last_error = '';
/***************************************************************************/
/* public: Constructor.
* root: template directory.
* unknowns: how to handle unknown variables.
*/
function Template($root = '.', $unknowns = 'remove')
{
$this->set_root($root);
$this->set_unknowns($unknowns);
}
/* public: setroot(pathname $root)
* root: new template directory.
*/
function set_root($root)
{
if (!is_dir($root))
{
$this->halt("set_root: $root is not a directory.");
return false;
}
$this->root = $root;
return true;
}
/* public: set_unknowns(enum $unknowns)
* unknowns: 'remove', 'comment', 'keep'
*
*/
function set_unknowns($unknowns = 'keep')
{
$this->unknowns = $unknowns;
}
/* public: set_file(array $filelist)
* filelist: array of handle, filename pairs.
*
* public: set_file(string $handle, string $filename)
* handle: handle for a filename,
* filename: name of template file
*/
function set_file($handle, $filename = '')
{
if (!is_array($handle))
{
if ($filename == '')
{
$this->halt("set_file: For handle $handle filename is empty.");
return false;
}
$this->file[$handle] = $this->filename($filename);
}
else
{
reset($handle);
while(list($h, $f) = each($handle))
{
$this->file[$h] = $this->filename($f);
}
}
}
/* public: set_block(string $parent, string $handle, string $name = '')
* extract the template $handle from $parent,
* place variable {$name} instead.
*/
function set_block($parent, $handle, $name = '')
{
if (!$this->loadfile($parent))
{
$this->halt("subst: unable to load $parent.");
return false;
}
if ($name == '')
{
$name = $handle;
}
$str = $this->get_var($parent);
$reg = "/<!--\s+BEGIN $handle\s+-->(.*)\n\s*<!--\s+END $handle\s+-->/sm";
preg_match_all($reg, $str, $m);
$str = preg_replace($reg, '{' . "$name}", $str);
$this->set_var($handle, $m[1][0]);
$this->set_var($parent, $str);
}
/* public: set_var(array $values)
* values: array of variable name, value pairs.
*
* public: set_var(string $varname, string $value)
* varname: name of a variable that is to be defined
* value: value of that variable
*/
function set_var($varname, $value = '')
{
if (!is_array($varname))
{
if (!empty($varname))
{
if ($this->debug)
{
print "scalar: set *$varname* to *$value*<br>\n";
}
$this->varkeys[$varname] = $this->varname($varname);
$this->varvals[$varname] = str_replace('phpGroupWare','eGroupWare',$value);
}
}
else
{
reset($varname);
while(list($k, $v) = each($varname))
{
if (!empty($k))
{
if ($this->debug)
{
print "array: set *$k* to *$v*<br>\n";
}
$this->varkeys[$k] = $this->varname($k);
$this->varvals[$k] = str_replace('phpGroupWare','eGroupWare',$v);
}
}
}
}
/* public: subst(string $handle)
* handle: handle of template where variables are to be substituted.
*/
function subst($handle)
{
if (!$this->loadfile($handle))
{
$this->halt("subst: unable to load $handle.");
return false;
}
$str = $this->get_var($handle);
reset($this->varkeys);
while (list($k, $v) = each($this->varkeys))
{
$str = str_replace($v, $this->varvals[$k], $str);
}
return $str;
}
/* public: psubst(string $handle)
* handle: handle of template where variables are to be substituted.
*/
function psubst($handle)
{
print $this->subst($handle);
return false;
}
/* public: parse(string $target, string $handle, boolean append)
* public: parse(string $target, array $handle, boolean append)
* target: handle of variable to generate
* handle: handle of template to substitute
* append: append to target handle
*/
function parse($target, $handle, $append = false)
{
if (!is_array($handle))
{
$str = $this->subst($handle);
if ($append)
{
$this->set_var($target, $this->get_var($target) . $str);
}
else
{
$this->set_var($target, $str);
}
}
else
{
reset($handle);
while(list($i, $h) = each($handle))
{
$str = $this->subst($h);
$this->set_var($target, $str);
}
}
return $str;
}
function pparse($target, $handle, $append = false)
{
print $this->parse($target, $handle, $append);
return false;
}
/* This is short for finish parse */
function fp($target, $handle, $append = False)
{
return $this->finish($this->parse($target, $handle, $append));
}
/* This is a short cut for print finish parse */
function pfp($target, $handle, $append = False)
{
echo $this->finish($this->parse($target, $handle, $append));
}
/* public: get_vars()
*/
function get_vars()
{
reset($this->varkeys);
while(list($k, $v) = each($this->varkeys))
{
$result[$k] = $this->varvals[$k];
}
return $result;
}
/* public: get_var(string varname)
* varname: name of variable.
*
* public: get_var(array varname)
* varname: array of variable names
*/
function get_var($varname)
{
if (!is_array($varname))
{
return $this->varvals[$varname];
}
else
{
reset($varname);
while(list($k, $v) = each($varname))
{
$result[$k] = $this->varvals[$k];
}
return $result;
}
}
/* public: get_undefined($handle)
* handle: handle of a template.
*/
function get_undefined($handle)
{
if (!$this->loadfile($handle))
{
$this->halt("get_undefined: unable to load $handle.");
return false;
}
preg_match_all("/\{([^}]+)\}/", $this->get_var($handle), $m);
$m = $m[1];
if (!is_array($m))
{
return false;
}
reset($m);
while(list($k, $v) = each($m))
{
if (!isset($this->varkeys[$v]))
{
$result[$v] = $v;
}
}
if (count($result))
{
return $result;
}
else
{
return false;
}
}
/* public: finish(string $str)
* str: string to finish.
*/
function finish($str)
{
switch ($this->unknowns)
{
case 'keep':
break;
case 'remove':
$str = preg_replace('/{[^ \t\r\n}]+}/', '', $str);
break;
case 'comment':
$str = preg_replace('/{([^ \t\r\n}]+)}/', "<!-- Template $handle: Variable \\1 undefined -->", $str);
break;
}
return $str;
}
/* public: p(string $varname)
* varname: name of variable to print.
*/
function p($varname)
{
print $this->finish($this->get_var($varname));
}
function get($varname)
{
return $this->finish($this->get_var($varname));
}
/***************************************************************************/
/* private: filename($filename)
* filename: name to be completed.
*/
function filename($filename,$root='',$time=1)
{
if($root=='')
{
$root=$this->root;
}
if (substr($filename, 0, 1) != '/')
{
$new_filename = $root.'/'.$filename;
}
else
{
$new_filename = $filename;
}
if (!file_exists($new_filename))
{
if($time==2)
{
$this->halt("filename: file $new_filename does not exist.");
}
else
{
$new_root = str_replace($GLOBALS['egw_info']['server']['template_set'],'default',$root);
$new_filename = $this->filename(str_replace($root.'/','',$new_filename),$new_root,2);
}
}
return $new_filename;
}
/* private: varname($varname)
* varname: name of a replacement variable to be protected.
*/
function varname($varname)
{
return '{'.$varname.'}';
}
/* private: loadfile(string $handle)
* handle: load file defined by handle, if it is not loaded yet.
*/
function loadfile($handle)
{
if (isset($this->varkeys[$handle]) and !empty($this->varvals[$handle]))
{
return true;
}
if (!isset($this->file[$handle]))
{
$this->halt("loadfile: $handle is not a valid handle.");
return false;
}
$filename = $this->file[$handle];
$str = implode('', @file($filename));
if (empty($str))
{
$this->halt("loadfile: While loading $handle, $filename does not exist or is empty.");
return false;
}
$this->set_var($handle, $str);
return true;
}
/***************************************************************************/
/* public: halt(string $msg)
* msg: error message to show.
*/
function halt($msg)
{
$this->last_error = $msg;
if ($this->halt_on_error != 'no')
{
$this->haltmsg($msg);
}
if ($this->halt_on_error == 'yes')
{
echo('<b>Halted.</b>');
}
exit;
}
/* public, override: haltmsg($msg)
* msg: error message to show.
*/
function haltmsg($msg)
{
printf("<b>Template Error:</b> %s<br>\n", $msg);
}
}

4
setup/inc/class.setup.inc.php
View File

@ -51,8 +51,8 @@
/** /**
* @var float $required_php_version php version required by eGroupWare * @var float $required_php_version php version required by eGroupWare
*/ */
var $required_php_version = 4.3; var $required_php_version = 5.1;
var $recommended_php_version = '5+'; var $recommended_php_version = '5.1+';
function setup($html=False, $translation=False) function setup($html=False, $translation=False)
{ {

2
setup/inc/class.setup_header.inc.php
View File

@ -158,7 +158,7 @@ class setup_header
*/ */
function generate($egw_info,$egw_domain) function generate($egw_info,$egw_domain)
{ {
$tpl =& CreateObject('setup.Template','../'); $tpl =& CreateObject('phpgwapi.Template','../');
$tpl->set_file(array('header' => 'header.inc.php.template')); $tpl->set_file(array('header' => 'header.inc.php.template'));
$tpl->set_block('header','domain','domain'); $tpl->set_block('header','domain','domain');

2
setup/index.php
View File

@ -24,7 +24,7 @@
@set_time_limit(0); @set_time_limit(0);
$tpl_root = $GLOBALS['egw_setup']->html->setup_tpl_dir('setup'); $tpl_root = $GLOBALS['egw_setup']->html->setup_tpl_dir('setup');
$setup_tpl = CreateObject('setup.Template',$tpl_root); $setup_tpl = CreateObject('phpgwapi.Template',$tpl_root);
$setup_tpl->set_file(array $setup_tpl->set_file(array
( (
'T_head' => 'head.tpl', 'T_head' => 'head.tpl',

2
setup/manageheader.php
View File

@ -23,7 +23,7 @@ include('./inc/functions.inc.php');
require_once('./inc/class.setup_header.inc.php'); require_once('./inc/class.setup_header.inc.php');
$GLOBALS['egw_setup']->header =& new setup_header(); $GLOBALS['egw_setup']->header =& new setup_header();
$setup_tpl = CreateObject('setup.Template','./templates/default'); $setup_tpl = CreateObject('phpgwapi.Template','./templates/default');
$setup_tpl->set_file(array( $setup_tpl->set_file(array(
'T_head' => 'head.tpl', 'T_head' => 'head.tpl',
'T_footer' => 'footer.tpl', 'T_footer' => 'footer.tpl',

2
setup/schematoy.php
View File

@ -31,7 +31,7 @@
// Does not return unless user is authorized // Does not return unless user is authorized
$tpl_root = $GLOBALS['egw_setup']->html->setup_tpl_dir('setup'); $tpl_root = $GLOBALS['egw_setup']->html->setup_tpl_dir('setup');
$GLOBALS['setup_tpl'] = CreateObject('setup.Template',$tpl_root); $GLOBALS['setup_tpl'] = CreateObject('phpgwapi.Template',$tpl_root);
$GLOBALS['setup_tpl']->set_file(array( $GLOBALS['setup_tpl']->set_file(array(
'T_head' => 'head.tpl', 'T_head' => 'head.tpl',
'T_footer' => 'footer.tpl', 'T_footer' => 'footer.tpl',

2
setup/sqltoarray.php
View File

@ -29,7 +29,7 @@
// Does not return unless user is authorized // Does not return unless user is authorized
$tpl_root = $GLOBALS['egw_setup']->html->setup_tpl_dir('setup'); $tpl_root = $GLOBALS['egw_setup']->html->setup_tpl_dir('setup');
$setup_tpl = CreateObject('setup.Template',$tpl_root); $setup_tpl = CreateObject('phpgwapi.Template',$tpl_root);
$cancel = get_var('cancel',Array('GET','POST')); $cancel = get_var('cancel',Array('GET','POST'));
if($cancel) if($cancel)