From fc1ce1fa71828e3554dc281557a5ab2564dd7f8d Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sun, 9 Dec 2007 08:03:56 +0000 Subject: [PATCH] removed copy of Template object in setup, using the one in the api --- setup/account_migration.php | 2 +- setup/admin_account.php | 2 +- setup/applications.php | 2 +- setup/applist.php | 2 +- setup/check_install.php | 2 +- setup/config.php | 4 +- setup/inc/class.Template.inc.php | 449 --------------------------- setup/inc/class.setup.inc.php | 4 +- setup/inc/class.setup_header.inc.php | 2 +- setup/index.php | 2 +- setup/manageheader.php | 2 +- setup/schematoy.php | 2 +- setup/sqltoarray.php | 2 +- 13 files changed, 14 insertions(+), 463 deletions(-) delete mode 100644 setup/inc/class.Template.inc.php diff --git a/setup/account_migration.php b/setup/account_migration.php index a6f674ea8a..2b7d96e609 100644 --- a/setup/account_migration.php +++ b/setup/account_migration.php @@ -38,7 +38,7 @@ if (isset($_REQUEST['setup_session'])) session_start(); $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( 'migration' => 'account_migration.tpl', 'T_head' => 'head.tpl', diff --git a/setup/admin_account.php b/setup/admin_account.php index f06539e5ee..979e29d0bc 100644 --- a/setup/admin_account.php +++ b/setup/admin_account.php @@ -53,7 +53,7 @@ if(!$_POST['submit'] || $error) { $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( 'T_head' => 'head.tpl', 'T_footer' => 'footer.tpl', diff --git a/setup/applications.php b/setup/applications.php index e9d8f7e8e4..b1fe90bb01 100644 --- a/setup/applications.php +++ b/setup/applications.php @@ -39,7 +39,7 @@ // Does not return unless user is authorized $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( 'T_head' => 'head.tpl', 'T_footer' => 'footer.tpl', diff --git a/setup/applist.php b/setup/applist.php index 9705b628e8..12ae6b09a1 100644 --- a/setup/applist.php +++ b/setup/applist.php @@ -30,7 +30,7 @@ // Does not return unless user is authorized $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( 'T_head' => 'head.tpl', 'T_footer' => 'footer.tpl' diff --git a/setup/check_install.php b/setup/check_install.php index e30697a952..f875b1f41e 100644 --- a/setup/check_install.php +++ b/setup/check_install.php @@ -704,7 +704,7 @@ if ($run_by_webserver) { $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( 'T_head' => 'head.tpl', 'T_footer' => 'footer.tpl', diff --git a/setup/config.php b/setup/config.php index a4ea0aef1f..9a36308a3d 100644 --- a/setup/config.php +++ b/setup/config.php @@ -31,7 +31,7 @@ } $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( 'T_head' => 'head.tpl', @@ -145,7 +145,7 @@ $GLOBALS['egw']->common =& CreateObject('phpgwapi.common'); $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_file(array('config' => 'config.tpl')); diff --git a/setup/inc/class.Template.inc.php b/setup/inc/class.Template.inc.php deleted file mode 100644 index be04b8cf4c..0000000000 --- a/setup/inc/class.Template.inc.php +++ /dev/null @@ -1,449 +0,0 @@ - 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 = "/(.*)\n\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*
\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*
\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}]+)}/', "", $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('Halted.'); - } - - exit; - } - - /* public, override: haltmsg($msg) - * msg: error message to show. - */ - function haltmsg($msg) - { - printf("Template Error: %s
\n", $msg); - } - } diff --git a/setup/inc/class.setup.inc.php b/setup/inc/class.setup.inc.php index b63d3d5289..9d9837a172 100644 --- a/setup/inc/class.setup.inc.php +++ b/setup/inc/class.setup.inc.php @@ -51,8 +51,8 @@ /** * @var float $required_php_version php version required by eGroupWare */ - var $required_php_version = 4.3; - var $recommended_php_version = '5+'; + var $required_php_version = 5.1; + var $recommended_php_version = '5.1+'; function setup($html=False, $translation=False) { diff --git a/setup/inc/class.setup_header.inc.php b/setup/inc/class.setup_header.inc.php index dee811b898..6b10b0dfba 100644 --- a/setup/inc/class.setup_header.inc.php +++ b/setup/inc/class.setup_header.inc.php @@ -158,7 +158,7 @@ class setup_header */ 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_block('header','domain','domain'); diff --git a/setup/index.php b/setup/index.php index 8727b123ff..45b626d597 100644 --- a/setup/index.php +++ b/setup/index.php @@ -24,7 +24,7 @@ @set_time_limit(0); $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 ( 'T_head' => 'head.tpl', diff --git a/setup/manageheader.php b/setup/manageheader.php index 69911c55be..0a087f0513 100644 --- a/setup/manageheader.php +++ b/setup/manageheader.php @@ -23,7 +23,7 @@ include('./inc/functions.inc.php'); require_once('./inc/class.setup_header.inc.php'); $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( 'T_head' => 'head.tpl', 'T_footer' => 'footer.tpl', diff --git a/setup/schematoy.php b/setup/schematoy.php index 2a33d99ae5..849224d0f1 100644 --- a/setup/schematoy.php +++ b/setup/schematoy.php @@ -31,7 +31,7 @@ // Does not return unless user is authorized $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( 'T_head' => 'head.tpl', 'T_footer' => 'footer.tpl', diff --git a/setup/sqltoarray.php b/setup/sqltoarray.php index 48944d9013..2877ddc44b 100644 --- a/setup/sqltoarray.php +++ b/setup/sqltoarray.php @@ -29,7 +29,7 @@ // Does not return unless user is authorized $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')); if($cancel)