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

some fixed to enable infolog with etemplates to run in 0.9.14

Browse Source
This commit is contained in:
Ralf Becker 2002-10-17 23:34:28 +00:00
parent 8071f483c7
commit d63e2607f8
6 changed files with 164 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,10 @@
/* $Id$ */
if (!function_exists('get_var'))
{
include_once('get_var.php');
}
$ui = ''; // html UI, which UI to use, should come from api and be in $GLOBALS['phpgw']???
if ($_ENV['DISPLAY'] && isset($_SERVER['_']))
{

13
etemplate/inc/class.uietemplate.inc.php
View File

@ -111,8 +111,11 @@
$changes = array();
}
$hooked = $GLOBALS['phpgw']->template->get_var('phpgw_body');
$GLOBALS['phpgw']->common->phpgw_header();
if (!@$GLOBALS['phpgw_info']['etemplate']['hooked'])
{
$GLOBALS['phpgw']->common->phpgw_header();
}
if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'etemplate')
{
$GLOBALS['phpgw']->translation->add_app('etemplate'); // some extensions have own texts
@ -148,7 +151,11 @@
if ($this->stable)
{
echo parse_navbar() . $html;
if (!@$GLOBALS['phpgw_info']['etemplate']['hooked'])
{
echo parse_navbar();
}
echo $html;
}
else
{

141
etemplate/inc/get_var.php Normal file
View File

@ -0,0 +1,141 @@
<?php
function reg_var($varname, $method = 'any', $valuetype = 'alphanumeric',$default_value='',$register=True)
{
if($method == 'any')
{
$method = Array('POST','GET','COOKIE','SERVER','GLOBAL','DEFAULT');
}
elseif(!is_array($method))
{
$method = Array($method);
}
$cnt = count($method);
for($i=0;$i<$cnt;$i++)
{
switch(strtoupper($method[$i]))
{
case 'DEFAULT':
if($default_value)
{
$value = $default_value;
$i = $cnt+1; /* Found what we were looking for, now we end the loop */
}
break;
case 'GLOBAL':
if(@isset($GLOBALS[$varname]))
{
$value = $GLOBALS[$varname];
$i = $cnt+1;
}
break;
case 'POST':
case 'GET':
case 'COOKIE':
case 'SERVER':
if(phpversion() >= '4.2.0')
{
$meth = '_'.strtoupper($method[$i]);
}
else
{
$meth = 'HTTP_'.strtoupper($method[$i]).'_VARS';
}
if(@isset($GLOBALS[$meth][$varname]))
{
$value = $GLOBALS[$meth][$varname];
$i = $cnt+1;
}
break;
default:
if(@isset($GLOBALS[strtoupper($method[$i])][$varname]))
{
$value = $GLOBALS[strtoupper($method[$i])][$varname];
$i = $cnt+1;
}
break;
}
}
if (@!isset($value))
{
$value = $default_value;
}
if (@!is_array($value))
{
if ($value == '')
{
$result = $value;
}
else
{
if (sanitize($value,$valuetype) == 1)
{
$result = $value;
}
else
{
$result = $default_value;
}
}
}
else
{
reset($value);
while(list($k, $v) = each($value))
{
if ($v == '')
{
$result[$k] = $v;
}
else
{
if (is_array($valuetype))
{
$vt = $valuetype[$k];
}
else
{
$vt = $valuetype;
}
if (sanitize($v,$vt) == 1)
{
$result[$k] = $v;
}
else
{
if (is_array($default_value))
{
$result[$k] = $default_value[$k];
}
else
{
$result[$k] = $default_value;
}
}
}
}
}
if($register)
{
$GLOBALS['phpgw_info'][$GLOBALS['phpgw_info']['flags']['currentapp']][$varname] = $result;
}
return $result;
}
/*!
@function get_var
@abstract retrieve a value from either a POST, GET, COOKIE, SERVER or from a class variable.
@author skeeter
@discussion This function is used to retrieve a value from a user defined order of methods.
@syntax get_var('id',array('HTTP_POST_VARS'||'POST','HTTP_GET_VARS'||'GET','HTTP_COOKIE_VARS'||'COOKIE','GLOBAL','DEFAULT'));
@example $this->id = get_var('id',array('HTTP_POST_VARS'||'POST','HTTP_GET_VARS'||'GET','HTTP_COOKIE_VARS'||'COOKIE','GLOBAL','DEFAULT'));
@param $variable name
@param $method ordered array of methods to search for supplied variable
@param $default_value (optional)
*/
function get_var($variable,$method='any',$default_value='')
{
return reg_var($variable,$method,'any',$default_value,False);
}

2
infolog/inc/class.bolink.inc.php
View File

@ -13,6 +13,8 @@
/* $Id$ */
include_once(PHPGW_INCLUDE_ROOT . '/infolog/inc/class.solink.inc.php');
$GLOBALS['phpgw_info']['flags']['included_classes']['bolink'] = True;
/*!
@class bolink

1
infolog/inc/class.solink.inc.php
View File

@ -12,6 +12,7 @@
/* $Id$ */
$GLOBALS['phpgw_info']['flags']['included_classes']['solink'] = True;
/*!
@class solink
@author ralfbecker

8
infolog/inc/hook_addressbook_view.inc.php
View File

@ -12,7 +12,7 @@
/* $Id$ */
$save_app = $GLOBALS['phpgw_info']['flags']['currentapp'];
$GLOBALS['phpgw_info']['flags']['currentapp'] = 'infolog';
$GLOBALS['phpgw_info']['flags']['currentapp'] = 'infolog';
$GLOBALS['phpgw']->translation->add_app('infolog');
@ -25,9 +25,13 @@
$out = $html->form($out,'','/index.php',array('menuaction'=>'addressbook.uiaddressbook.view','ab_id'=>$GLOBALS['ab_id']));
$GLOBALS['phpgw']->template->set_var('phpgw_body',$out,True);
*/
$GLOBALS['phpgw_info']['etemplate']['hooked'] = True;
$infolog = CreateObject('infolog.uiinfolog');
$infolog->index(0,'addressbook',$GLOBALS['ab_id'],array(
'menuaction' => 'addressbook.uiaddressbook.view',
'ab_id' => $GLOBALS['ab_id']
));
$GLOBALS['phpgw_info']['flags']['currentapp'] = $save_app;
$GLOBALS['phpgw_info']['flags']['currentapp'] = $save_app;
unset($GLOBALS['phpgw_info']['etemplate']['hooked']);