extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-20 18:08:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

formatting, globals

Browse Source
This commit is contained in:
Miles Lott 2001-10-17 18:15:04 +00:00
parent d2cc52c47d
commit e6e3e567bc
3 changed files with 440 additions and 374 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

252
phpgwapi/inc/class.Template_new.inc.php
View File

@ -12,14 +12,15 @@
* any later version. * * any later version. *
\**************************************************************************/ \**************************************************************************/
/** /*
* HTML template parser * HTML template parser
* Ben Woodhead * Ben Woodhead
* ben@echo-chn.net * ben@echo-chn.net
* LGPL * LGPL
* @package phpgwapi * @package phpgwapi
*/ */
class Template { class Template
{
/** Internal Use - Array of file names */ /** Internal Use - Array of file names */
var $m_file = array(); var $m_file = array();
/** Internal Use - Array of block names*/ /** Internal Use - Array of block names*/
@ -35,30 +36,36 @@ class Template {
/** Internal Use - Defines what to do with unknown tags /** Internal Use - Defines what to do with unknown tags
* @param keep, remove, or comment * @param keep, remove, or comment
*/ */
var $m_unknowns = ""; var $m_unknowns = '';
/** Internal Use - class error instance */ /** Internal Use - class error instance */
var $c_error = ""; var $c_error = '';
/** Default constructor /** Default constructor
* @param path - Path to were templates are located (default in preferences) * @param path - Path to were templates are located (default in preferences)
* @param unknown - Defines what to do with unknown tags (default in preferences) * @param unknown - Defines what to do with unknown tags (default in preferences)
*/ */
function Template($root="", $unknowns="") { function Template($root='', $unknowns='')
{
global $preferences; global $preferences;
$this->c_error = createObject("cError","1"); $this->c_error = createObject('cError','1');
$this->c_error->set_file(__FILE__); $this->c_error->set_file(__FILE__);
if (!empty($root)) { if (!empty($root))
{
$this->set_root($root); $this->set_root($root);
} }
else { else
$this->set_root($preferences["template"]["path"]); {
$this->set_root($preferences['template']['path']);
} }
if (!empty($unknowns)) { if (!empty($unknowns))
{
$this->set_unknowns($unknowns); $this->set_unknowns($unknowns);
} else { }
$this->set_unknowns($preferences["template"]["unknowns"]); else
{
$this->set_unknowns($preferences['template']['unknowns']);
} }
} }
@ -66,17 +73,24 @@ class Template {
* @param path - Path to were templates are located * @param path - Path to were templates are located
* @returns returns false if an error has occured * @returns returns false if an error has occured
*/ */
function set_root($root) { function set_root($root)
if (!is_array($root)) { {
if (!is_dir($root)) { if (!is_array($root))
{
if (!is_dir($root))
{
$this->c_error->halt("set_root (scalar): $root is not a directory.",0,__LINE__); $this->c_error->halt("set_root (scalar): $root is not a directory.",0,__LINE__);
return false; return false;
} }
$this->m_root[] = $root; $this->m_root[] = $root;
} else { }
else
{
reset($root); reset($root);
while(list($k, $v) = each($root)) { while(list($k, $v) = each($root))
if (!is_dir($v)) { {
if (!is_dir($v))
{
$this->c_error->halt("set_root (array): $v (entry $k of root) is not a directory.",0,__LINE__); $this->c_error->halt("set_root (array): $v (entry $k of root) is not a directory.",0,__LINE__);
return false; return false;
} }
@ -92,7 +106,8 @@ class Template {
* @notes remove - removes unknown tags * @notes remove - removes unknown tags
* @returns returns false if an error has occured * @returns returns false if an error has occured
*/ */
function set_unknowns($unknowns = "") { function set_unknowns($unknowns='')
{
$this->m_unknowns = $unknowns; $this->m_unknowns = $unknowns;
} }
@ -102,17 +117,24 @@ class Template {
* @notes Must be passed in as array * @notes Must be passed in as array
* @returns returns false if an error has occured * @returns returns false if an error has occured
*/ */
function set_file($varname, $filename = "") { function set_file($varname, $filename='')
if (!is_array($varname)) { {
if ($filename == "") { if (!is_array($varname))
{
if ($filename == '')
{
$c_error->halt("set_file: For varname $varname filename is empty.",0,__LINE__); $c_error->halt("set_file: For varname $varname filename is empty.",0,__LINE__);
return false; return false;
} }
$this->m_file[$varname] = $this->filename($filename); $this->m_file[$varname] = $this->filename($filename);
} else { }
else
{
reset($varname); reset($varname);
while(list($h, $f) = each($varname)) { while(list($h, $f) = each($varname))
if ($f == "") { {
if ($f == '')
{
$this->c_error->halt("set_file: For varname $h filename is empty.",0,__LINE__); $this->c_error->halt("set_file: For varname $h filename is empty.",0,__LINE__);
return false; return false;
} }
@ -129,12 +151,14 @@ class Template {
* @notes Also can be used to define nested blocks * @notes Also can be used to define nested blocks
* @returns Currently returns true * @returns Currently returns true
*/ */
function set_block($parent, $varname, $name = "") { function set_block($parent, $varname, $name='')
if ($name == "") { {
if ($name == '')
{
$name = $varname; $name = $varname;
} }
$this->m_block[$varname]["parent"] = $parent; $this->m_block[$varname]['parent'] = $parent;
$this->m_block[$varname]["alias"] = $name; $this->m_block[$varname]['alias'] = $name;
return true; return true;
} }
@ -143,17 +167,24 @@ class Template {
* @param Value that will be included when parsing complete * @param Value that will be included when parsing complete
* @return No return * @return No return
*/ */
function set_var($varname, $value = "") { function set_var($varname, $value='')
if (!is_array($varname)) { {
if (!empty($varname)) { if (!is_array($varname))
$this->m_varkeys[$varname] = "/".$this->varname($varname)."/"; {
if (!empty($varname))
{
$this->m_varkeys[$varname] = '/' . $this->varname($varname) . '/';
$this->m_varvals[$varname] = $value; $this->m_varvals[$varname] = $value;
} }
} else { }
else
{
reset($varname); reset($varname);
while(list($k, $v) = each($varname)) { while(list($k, $v) = each($varname))
if (!empty($k)) { {
$this->m_varkeys[$k] = "/".$this->varname($k)."/"; if (!empty($k))
{
$this->m_varkeys[$k] = '/' . $this->varname($k) . '/';
$this->m_varvals[$k] = $v; $this->m_varvals[$k] = $v;
} }
} }
@ -165,7 +196,8 @@ class Template {
* @return processed string * @return processed string
* @notes Internal Use * @notes Internal Use
*/ */
function subst($varname) { function subst($varname)
{
$str = $this->get_var($varname); $str = $this->get_var($varname);
$str = @preg_replace($this->m_varkeys, $this->m_varvals, $str); $str = @preg_replace($this->m_varkeys, $this->m_varvals, $str);
return $str; return $str;
@ -175,7 +207,8 @@ class Template {
* @param Tag name found in template file * @param Tag name found in template file
* @notes Internal Use * @notes Internal Use
*/ */
function psubst($varname) { function psubst($varname)
{
print $this->subst($varname); print $this->subst($varname);
return false; return false;
} }
@ -186,17 +219,25 @@ class Template {
* @param Append - Should text be append to file (defaults no false) * @param Append - Should text be append to file (defaults no false)
* @return processed string * @return processed string
*/ */
function parse($target, $varname, $append = false) { function parse($target, $varname, $append = false)
if (!is_array($varname)) { {
if (!is_array($varname))
{
$str = $this->subst($varname); $str = $this->subst($varname);
if ($append) { if ($append)
{
$this->set_var($target, $this->get_var($target) . $str); $this->set_var($target, $this->get_var($target) . $str);
} else { }
else
{
$this->set_var($target, $str); $this->set_var($target, $str);
} }
} else { }
else
{
reset($varname); reset($varname);
while(list($i, $h) = each($varname)) { while(list($i, $h) = each($varname))
{
$str = $this->subst($h); $str = $this->subst($h);
$this->set_var($target, $str); $this->set_var($target, $str);
} }
@ -209,7 +250,8 @@ class Template {
* @param Block - Name of block to process * @param Block - Name of block to process
* @param Append - Should text be append to file (defaults no false) * @param Append - Should text be append to file (defaults no false)
*/ */
function pparse($target, $varname, $append = false) { function pparse($target, $varname, $append = false)
{
print $this->parse($target, $varname, $append); print $this->parse($target, $varname, $append);
return false; return false;
} }
@ -217,9 +259,11 @@ class Template {
/** Gets the tags from the array /** Gets the tags from the array
* @notes Internal use * @notes Internal use
*/ */
function get_vars() { function get_vars()
{
reset($this->m_varkeys); reset($this->m_varkeys);
while(list($k, $v) = each($this->m_varkeys)) { while(list($k, $v) = each($this->m_varkeys))
{
$result[$k] = $this->get_var($k); $result[$k] = $this->get_var($k);
} }
@ -230,27 +274,37 @@ class Template {
* @notes Internal use * @notes Internal use
* @returns Result array * @returns Result array
*/ */
function get_var($varname) { function get_var($varname)
if (!is_array($varname)) { {
if (!isset($this->m_varkeys[$varname]) or empty($this->m_varvals[$varname])) { if (!is_array($varname))
if (isset($this->m_file[$varname])) { {
if (!isset($this->m_varkeys[$varname]) or empty($this->m_varvals[$varname]))
{
if (isset($this->m_file[$varname]))
{
$this->loadfile($varname); $this->loadfile($varname);
} }
if (isset($this->m_block[$varname])) { if (isset($this->m_block[$varname]))
{
$this->implodeBlock($varname); $this->implodeBlock($varname);
} }
} }
return(isset($this->m_varvals[$varname]) ? $this->m_varvals[$varname] : ""); return(isset($this->m_varvals[$varname]) ? $this->m_varvals[$varname] : '');
} else {
}
else
{
reset($varname); reset($varname);
while(list($k, $v) = each($varname)) { while(list($k, $v) = each($varname))
if (!isset($this->m_varkeys[$varname]) or empty($this->m_varvals[$varname])) { {
if ($this->m_file[$v]) { if (!isset($this->m_varkeys[$varname]) or empty($this->m_varvals[$varname]))
{
if ($this->m_file[$v])
{
$this->loadfile($v); $this->loadfile($v);
} }
if ($this->m_block[$v]) { if ($this->m_block[$v])
{
$this->implodeBlock($v); $this->implodeBlock($v);
} }
} }
@ -263,22 +317,29 @@ class Template {
/** Gets undefined /** Gets undefined
* @notes Internal Use * @notes Internal Use
*/ */
function get_undefined($varname) { function get_undefined($varname)
{
$str = $this->get_var($varname); $str = $this->get_var($varname);
preg_match_all("/\\{([a-zA-Z0-9_]+)\\}/", $str, $m); preg_match_all("/\\{([a-zA-Z0-9_]+)\\}/", $str, $m);
$m = $m[1]; $m = $m[1];
if (!is_array($m)) { if (!is_array($m))
{
return false; return false;
} }
reset($m); reset($m);
while(list($k, $v) = each($m)) { while(list($k, $v) = each($m))
{
if (!isset($this->m_varkeys[$v])) if (!isset($this->m_varkeys[$v]))
{
$result[$v] = $v; $result[$v] = $v;
} }
if (count($result)) { }
if (count($result))
{
return $result; return $result;
} }
else { else
{
return false; return false;
} }
} }
@ -287,16 +348,16 @@ class Template {
* @notes Internal use * @notes Internal use
* @returns Processed string * @returns Processed string
*/ */
function finish($str) { function finish($str)
switch ($this->m_unknowns) { {
case "keep": switch ($this->m_unknowns)
{
case 'keep':
break; break;
case 'remove':
case "remove": $str = preg_replace("/{[^ \t\r\n}]+}/", '', $str);
$str = preg_replace("/{[^ \t\r\n}]+}/", "", $str);
break; break;
case 'comment':
case "comment":
$str = preg_replace("/{[^ \t\r\n}]+}/", "<!-- Template $varname: Variable \\1 undefined -->", $str); $str = preg_replace("/{[^ \t\r\n}]+}/", "<!-- Template $varname: Variable \\1 undefined -->", $str);
break; break;
} }
@ -306,7 +367,8 @@ class Template {
/** Print out template /** Print out template
* @param Alias to processed template * @param Alias to processed template
*/ */
function p($varname) { function p($varname)
{
print $this->finish($this->get_var($varname)); print $this->finish($this->get_var($varname));
} }
@ -314,7 +376,8 @@ class Template {
* @notes Internal use * @notes Internal use
* @returns processed tabs from finished * @returns processed tabs from finished
*/ */
function get($varname) { function get($varname)
{
return $this->finish($this->get_var($varname)); return $this->finish($this->get_var($varname));
} }
@ -322,20 +385,26 @@ class Template {
* @notes Internal use * @notes Internal use
* @returns Returns file name if not error has occured * @returns Returns file name if not error has occured
*/ */
function filename($filename) { function filename($filename)
if (substr($filename, 0, 1) == "/" || preg_match("/[a-z]{1}:/i",$filename) ) { {
if (file_exists($filename)) { if (substr($filename, 0, 1) == "/" || preg_match("/[a-z]{1}:/i",$filename) )
{
if (file_exists($filename))
{
return $filename; return $filename;
} }
else { else
{
$this->c_error->halt("filename (absolute): $filename does not exist.",0,__LINE__); $this->c_error->halt("filename (absolute): $filename does not exist.",0,__LINE__);
return false; return false;
} }
} }
reset($this->m_root); reset($this->m_root);
while(list($k, $v) = each($this->m_root)) { while(list($k, $v) = each($this->m_root))
{
$f = "$v/$filename"; $f = "$v/$filename";
if (file_exists($f)) { if (file_exists($f))
{
return $f; return $f;
} }
} }
@ -347,7 +416,8 @@ class Template {
* @notes Internal use * @notes Internal use
* @returns Block name * @returns Block name
*/ */
function varname($m_varname) { function varname($m_varname)
{
return preg_quote("{".$m_varname."}"); return preg_quote("{".$m_varname."}");
} }
@ -355,15 +425,18 @@ class Template {
* @notes Internal use * @notes Internal use
* @returns Processed string * @returns Processed string
*/ */
function loadfile($varname) { function loadfile($varname)
if (!isset($this->m_file[$varname])) { {
if (!isset($this->m_file[$varname]))
{
$this->c_error->halt("loadfile: $varname is not a valid varname.",0,__LINE__); $this->c_error->halt("loadfile: $varname is not a valid varname.",0,__LINE__);
return false; return false;
} }
$filename = $this->filename($this->m_file[$varname]); $filename = $this->filename($this->m_file[$varname]);
$str = implode("", @file($filename)); $str = implode('', @file($filename));
if (empty($str)) { if (empty($str))
{
$this->c_error->halt("loadfile: While loading $varname, $filename does not exist or is empty.",0,__LINE__); $this->c_error->halt("loadfile: While loading $varname, $filename does not exist or is empty.",0,__LINE__);
return false; return false;
} }
@ -375,9 +448,10 @@ class Template {
/** Implode Blocks /** Implode Blocks
* @notes Internal use * @notes Internal use
*/ */
function implodeBlock($varname) { function implodeBlock($varname)
$parent = $this->m_block[$varname]["parent"]; {
$alias = $this->m_block[$varname]["alias"]; $parent = $this->m_block[$varname]['parent'];
$alias = $this->m_block[$varname]['alias'];
$str = $this->get_var($parent); $str = $this->get_var($parent);

11
phpgwapi/inc/class.crypto.inc.php
View File

@ -33,13 +33,12 @@
function crypto($vars) function crypto($vars)
{ {
global $phpgw, $phpgw_info;
$key = $vars[0]; $key = $vars[0];
$iv = $vars[1]; $iv = $vars[1];
if ($phpgw_info['server']['mcrypt_enabled'] && extension_loaded('mcrypt')) if ($GLOBALS['phpgw_info']['server']['mcrypt_enabled'] && extension_loaded('mcrypt'))
{ {
$this->enabled = True; $this->enabled = True;
$this->mcrypt_version = $phpgw_info['server']['versions']['mcrypt']; $this->mcrypt_version = $GLOBALS['phpgw_info']['server']['versions']['mcrypt'];
if ($this->mcrypt_version == 'old') if ($this->mcrypt_version == 'old')
{ {
$this->td = false; $this->td = false;
@ -83,8 +82,6 @@
function cleanup() function cleanup()
{ {
global $phpgw_info;
if ($this->enabled) if ($this->enabled)
{ {
if ($this->mcrypt_version != 'old') if ($this->mcrypt_version != 'old')
@ -102,8 +99,6 @@
function encrypt($data) function encrypt($data)
{ {
global $phpgw_info;
$data = serialize($data); $data = serialize($data);
$data = addslashes($data); $data = addslashes($data);
@ -136,8 +131,6 @@
function decrypt($encrypteddata) function decrypt($encrypteddata)
{ {
global $phpgw_info;
// Disable all encryption if the admin didn't set it up // Disable all encryption if the admin didn't set it up
if ($this->enabled) if ($this->enabled)
{ {

13
phpgwapi/inc/class.phpgw.inc.php
View File

@ -100,7 +100,7 @@
*/ */
function link($url = '', $extravars = '') function link($url = '', $extravars = '')
{ {
global $phpgw, $phpgw_info, $usercookie, $kp3, $PHP_SELF; /* global $phpgw, $phpgw_info, $usercookie, $kp3, $PHP_SELF; */
return $this->session->link($url, $extravars); return $this->session->link($url, $extravars);
} }
@ -116,9 +116,9 @@
*/ */
function redirect($url = '') function redirect($url = '')
{ {
global $HTTP_ENV_VARS; /* global $HTTP_ENV_VARS; */
$iis = @strpos($HTTP_ENV_VARS['SERVER_SOFTWARE'], 'IIS', 0); $iis = @strpos($GLOBALS['HTTP_ENV_VARS']['SERVER_SOFTWARE'], 'IIS', 0);
if ( !$url ) if ( !$url )
{ {
@ -142,7 +142,7 @@
} }
/** /**
* Shortcut to tranlation class * Shortcut to translation class
* *
* This function is a basic wrapper to translation->translate() * This function is a basic wrapper to translation->translate()
* *
@ -156,9 +156,8 @@
*/ */
function lang($key, $m1 = '', $m2 = '', $m3 = '', $m4 = '') function lang($key, $m1 = '', $m2 = '', $m3 = '', $m4 = '')
{ {
global $phpgw; /* global $phpgw; */
return $this->translation->translate($key); return $this->translation->translate($key);
} }
/* end of class */ } /* end of class */
}
?> ?>