[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/inc common_functions.inc.php,NONE,1.16
|
From: |
Ralf Becker <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/inc common_functions.inc.php,NONE,1.16.2.1 functions.inc.php,1.121.2.13.2.1,1.121.2.13.2.2 |
|
Date: |
Wed, 26 Mar 2003 19:38:27 -0500 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv6227
Modified Files:
Tag: Version-0_9_16-branch
functions.inc.php
Added Files:
Tag: Version-0_9_16-branch
common_functions.inc.php
Log Message:
used common_functions from head now, to have get_var and other stuff to make
the transition easier
***** Error reading new file: [Errno 2] No such file or directory:
'common_functions.inc.php'
Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/functions.inc.php,v
retrieving revision 1.121.2.13.2.1
retrieving revision 1.121.2.13.2.2
diff -C2 -r1.121.2.13.2.1 -r1.121.2.13.2.2
*** functions.inc.php 26 Mar 2003 22:55:48 -0000 1.121.2.13.2.1
--- functions.inc.php 27 Mar 2003 00:38:25 -0000 1.121.2.13.2.2
***************
*** 35,410 ****
}
!
/****************************************************************************\
! * Direct functions, which are not part of the API class
*
! * because they are require to be availble at the lowest level.
*
!
\****************************************************************************/
! /*!
! @collection_start direct functions
! @abstract Direct functions, which are not part of the API class
because they are require to be availble at the lowest level.
! */
!
! /*!
! @function print_debug
! @abstract print debug data only when debugging mode is turned
on.
! @author jengo
! @discussion This function is used for debugging data.
! @syntax print_debug('message');
! @example print_debug('this is some debugging data');
! */
! function print_debug($text='',$var='',$part='APP',$level='notused')
! {
! if ((strtoupper($part) == 'APP' && DEBUG_APP == True) ||
(strtoupper($part) == 'API' && DEBUG_API == True))
! {
! if ($var == '')
! {
! echo "debug: $text <br>\n";
! }
! else
! {
! echo "$text: $var<br>\n";
! }
! }
! }
!
! /*!
! @function sanitize
! @abstract Validate data.
! @author seek3r
! @discussion This function is used to validate input data.
! @syntax sanitize('type', 'match string');
! @example sanitize('number',$somestring);
! */
!
! /*
! $GLOBALS['phpgw_info']['server']['sanitize_types']['number'] =
Array('type' => 'preg_match', 'string' => '/^[0-9]+$/i');
! */
!
! function sanitize($string,$type)
! {
! switch ($type)
! {
! case 'bool':
! if ($string == 1 || $string == 0)
! {
! return True;
! }
! break;
! case 'number':
! if (preg_match("/^[0-9]+$/i", $string))
! {
! return True;
! }
! break;
! case 'string':
! if (preg_match("/^[a-z]+$/i", $string))
! {
! return True;
! }
! break;
! case 'alpha':
! if (preg_match("/^[a-z0-9 -._]+$/i", $string))
! {
! return True;
! }
! break;
! case 'ip':
! if
(eregi("^[0-9]{1,3}(\.[0-9]{1,3}){3}$",$string))
! {
! $octets = split('\.',$string);
! for ($i=0; $i != count($octets); $i++)
! {
! if ($octets[$i] < 0 ||
$octets[$i] > 255)
! {
! return False;
! }
! }
! return True;
! }
! return False;
! break;
! case 'file':
! if (preg_match("/^[a-z0-9_]+\.+[a-z]+$/i",
$string))
! {
! return True;
! }
! break;
! case 'email':
! if
(eregi("^([[:alnum:]_%+=.-]+)@([[:alnum:]_.-]+)\.([a-z]{2,3}|[0-9]{1,3})$",$string))
! {
! return True;
! }
! break;
! case 'any':
! return True;
! break;
! default :
! if
(isset($GLOBALS['phpgw_info']['server']['sanitize_types'][$type]['type']))
! {
! if
($GLOBALS['phpgw_info']['server']['sanitize_types'][$type]['type']($GLOBALS['phpgw_info']['server']['sanitize_types'][$type]['string'],
$string))
! {
! return True;
! }
! }
! return False;
! }
! }
!
! function registervar($varname, $valuetype = 'alpha', $posttype =
'post', $allowblank = True)
! {
! switch ($posttype)
! {
! case 'get':
! $posttype = 'HTTP_GET_VARS';
! break;
! default :
! $posttype = 'HTTP_POST_VARS';
! }
!
! if (isset($GLOBALS[$posttype][$varname]))
! {
! if (!is_array($GLOBALS[$posttype][$varname]))
! {
! if ($allowblank == True &&
$GLOBALS[$posttype][$varname] == '')
! {
!
$GLOBALS['phpgw_info'][$GLOBALS['phpgw_info']['flags']['currentapp']][$varname]
= $GLOBALS[$posttype][$varname];
! return 'Post';
! }
! else
! {
! if
(sanitize($GLOBALS[$posttype][$varname],$valuetype) == 1)
! {
!
$GLOBALS['phpgw_info'][$GLOBALS['phpgw_info']['flags']['currentapp']][$varname]
= $GLOBALS[$posttype][$varname];
! return 'Post';
! }
! else
! {
! return False;
! }
! }
! return False;
! }
! else
! {
! if (is_array($valuetype))
! {
! reset($GLOBALS[$posttype][$varname]);
! $isvalid = True;
! while(list($key, $value) =
each($GLOBALS[$posttype][$varname]))
! {
! if ($allowblank == True &&
$GLOBALS[$posttype][$varname][$key] == '')
! {
! }
! else
! {
! if
(sanitize($GLOBALS[$posttype][$varname][$key],$valuetype[$key]) == 1)
! {
! }
! else
! {
! $isvalid =
False;
! }
! }
! }
! if ($isvalid)
! {
!
$GLOBALS['phpgw_info'][$GLOBALS['phpgw_info']['flags']['currentapp']][$varname]
= $GLOBALS[$posttype][$varname];
! return 'Post';
! }
! else
! {
! return 'Session';
! }
! return False;
! }
! }
! return False;
! }
! elseif (count($GLOBALS[$posttype]) == 0)
! {
! return 'Session';
! }
! else
! {
! return False;
! }
! }
!
! /*!
! @function CreateObject
! @abstract Load a class and include the class file if not done so
already.
! @author mdean
! @author milosch
! @author (thanks to jengo and ralf)
! @discussion This function is used to create an instance of a class,
and if the class file has not been included it will do so.
! @syntax CreateObject('app.class', 'constructor_params');
! @example $phpgw->acl = CreateObject('phpgwapi.acl');
! @param $classname name of class
! @param $p1-$p16 class parameters (all optional)
! */
! function CreateObject($class,
! $p1='_UNDEF_',$p2='_UNDEF_',$p3='_UNDEF_',$p4='_UNDEF_',
! $p5='_UNDEF_',$p6='_UNDEF_',$p7='_UNDEF_',$p8='_UNDEF_',
! $p9='_UNDEF_',$p10='_UNDEF_',$p11='_UNDEF_',$p12='_UNDEF_',
! $p13='_UNDEF_',$p14='_UNDEF_',$p15='_UNDEF_',$p16='_UNDEF_')
! {
! global $phpgw_info, $phpgw;
!
! if (is_object(@$GLOBALS['phpgw']->log) && $class !=
'phpgwapi.error' && $class != 'phpgwapi.errorlog')
! {
! //$GLOBALS['phpgw']->log->write(array('text'=>'D-Debug,
dbg: %1','p1'=>'This class was run:
'.$class,'file'=>__FILE__,'line'=>__LINE__));
! }
!
! /* error_reporting(0); */
! list($appname,$classname) = explode(".", $class);
!
! if
(!isset($GLOBALS['phpgw_info']['flags']['included_classes'][$classname]) ||
!
!$GLOBALS['phpgw_info']['flags']['included_classes'][$classname])
! {
!
if(@file_exists(PHPGW_INCLUDE_ROOT.'/'.$appname.'/inc/class.'.$classname.'.inc.php'))
! {
!
include(PHPGW_INCLUDE_ROOT.'/'.$appname.'/inc/class.'.$classname.'.inc.php');
!
$GLOBALS['phpgw_info']['flags']['included_classes'][$classname] = True;
! }
! else
! {
!
$GLOBALS['phpgw_info']['flags']['included_classes'][$classname] = False;
! }
! }
!
if($GLOBALS['phpgw_info']['flags']['included_classes'][$classname])
! {
! if ($p1 == '_UNDEF_' && $p1 != 1)
! {
! eval('$obj = new ' . $classname . ';');
! }
! else
! {
! $input =
array($p1,$p2,$p3,$p4,$p5,$p6,$p7,$p8,$p9,$p10,$p11,$p12,$p13,$p14,$p15,$p16);
! $i = 1;
! $code = '$obj = new ' . $classname . '(';
! while (list($x,$test) = each($input))
! {
! if (($test == '_UNDEF_' && $test != 1 )
|| $i == 17)
! {
! break;
! }
! else
! {
! $code .= '$p' . $i . ',';
! }
! $i++;
! }
! $code = substr($code,0,-1) . ');';
! eval($code);
! }
! /* error_reporting(E_ERROR | E_WARNING | E_PARSE); */
! return $obj;
! }
! }
!
! /*!
! @function ExecObject
! @abstract Execute a function, and load a class and include the class
file if not done so already.
! @author seek3r
! @discussion This function is used to create an instance of a class,
and if the class file has not been included it will do so.
! @syntax ExecObject('app.class', 'constructor_params');
! @param $method to execute
! @param $functionparams function param should be an array
! @param $loglevel developers choice of logging level
! @param $classparams params to be sent to the contructor
! @example ExecObject('phpgwapi.acl.read');
! */
! function ExecMethod($method, $functionparams = '_UNDEF_', $loglevel =
3, $classparams = '_UNDEF_')
! {
! /* Need to make sure this is working against a single
dimensional object */
! $partscount = count(explode('.',$method)) - 1;
! if ($partscount == 2)
! {
! list($appname,$classname,$functionname) = explode(".",
$method);
! if (!is_object($GLOBALS[$classname]))
! {
! if ($classparams != '_UNDEF_' && ($classparams
|| $classparams != 'True'))
! {
! $GLOBALS[$classname] =
CreateObject($appname.'.'.$classname, $classparams);
! }
! else
! {
! $GLOBALS[$classname] =
CreateObject($appname.'.'.$classname);
! }
! }
!
! if ((is_array($functionparams) || $functionparams !=
'_UNDEF_') && ($functionparams || $functionparams != 'True'))
! {
! return
$GLOBALS[$classname]->$functionname($functionparams);
! }
! else
! {
! return $GLOBALS[$classname]->$functionname();
! }
! }
! /* if the $method includes a parent class (multi-dimensional)
then we have to work from it */
! elseif ($partscount >= 3)
! {
! $GLOBALS['methodparts'] = explode(".", $method);
! $classpartnum = $partscount - 1;
! $appname = $GLOBALS['methodparts'][0];
! $classname = $GLOBALS['methodparts'][$classpartnum];
! $functionname = $GLOBALS['methodparts'][$partscount];
! /* Now I clear these out of the array so that I can do
a proper */
! /* loop and build the $parentobject */
! unset ($GLOBALS['methodparts'][0]);
! unset ($GLOBALS['methodparts'][$classpartnum]);
! unset ($GLOBALS['methodparts'][$partscount]);
! reset ($GLOBALS['methodparts']);
! $firstparent = 'True';
! while (list ($key, $val) = each
($GLOBALS['methodparts']))
! {
! if ($firstparent == 'True')
! {
! $parentobject = '$GLOBALS["'.$val.'"]';
! $firstparent = False;
! }
! else
! {
! $parentobject .= '->'.$val;
! }
! }
! unset($GLOBALS['methodparts']);
! $code = '$isobject =
is_object('.$parentobject.'->'.$classname.');';
! eval ($code);
! if (!$isobject)
! {
! if ($classparams != '_UNDEF_' && ($classparams
|| $classparams != 'True'))
! {
! if (is_string($classparams))
! {
!
eval($parentobject.'->'.$classname.' =
CreateObject("'.$appname.'.'.$classname.'", "'.$classparams.'");');
! }
! else
! {
!
eval($parentobject.'->'.$classname.' =
CreateObject("'.$appname.'.'.$classname.'", '.$classparams.');');
! }
! }
! else
! {
! eval($parentobject.'->'.$classname.' =
CreateObject("'.$appname.'.'.$classname.'");');
! }
! }
!
! if ($functionparams != '_UNDEF_' && ($functionparams ||
$functionparams != 'True'))
! {
! eval('$returnval =
'.$parentobject.'->'.$classname.'->'.$functionname.'('.$functionparams.');');
! return $returnval;
! }
! else
! {
! eval('$returnval =
'.$parentobject.'->'.$classname.'->'.$functionname.'();');
! return $returnval;
! }
! }
! else
! {
! return 'error in parts';
! }
! }
/*!
@function lang
--- 35,40 ----
}
! include(PHPGW_API_INC.'/common_functions.inc.php');
!
/*!
@function lang
***************
*** 425,524 ****
}
- /* Just a temp wrapper. ###DELETE_ME#### (Seek3r) */
- function check_code($code)
- {
- return $GLOBALS['phpgw']->common->check_code($code);
- }
-
- /*!
- @function get_account_id
- @abstract Return a properly formatted account_id.
- @author skeeter
- @discussion This function will return a properly formatted account_id.
This can take either a name or an account_id as paramters. If a name is
provided it will return the associated id.
- @syntax get_account_id($accountid);
- @example $account_id = get_account_id($accountid);
- @param $account_id either a name or an id
- @param $default_id either a name or an id
- */
- function get_account_id($account_id = '',$default_id = '')
- {
- if (gettype($account_id) == 'integer')
- {
- return $account_id;
- }
- elseif ($account_id == '')
- {
- if ($default_id == '')
- {
- return
(isset($GLOBALS['phpgw_info']['user']['account_id'])?$GLOBALS['phpgw_info']['user']['account_id']:0);
- }
- elseif (is_string($default_id))
- {
- return
$GLOBALS['phpgw']->accounts->name2id($default_id);
- }
- return intval($default_id);
- }
- elseif (is_string($account_id))
- {
-
if($GLOBALS['phpgw']->accounts->exists(intval($account_id)) == True)
- {
- return intval($account_id);
- }
- else
- {
- return
$GLOBALS['phpgw']->accounts->name2id($account_id);
- }
- }
- }
-
- /*!
- @function filesystem_separator
- @abstract sets the file system seperator depending on OS
- @result file system separator
- */
- function filesystem_separator()
- {
- if (PHP_OS == 'Windows' || PHP_OS == 'OS/2')
- {
- return '\\';
- }
- else
- {
- return '/';
- }
- }
-
- /* Just a wrapper to my new print_r() function I added to the php3
support file. Seek3r */
- function _debug_array($array,$print=True)
- {
- if(@floor(phpversion()) == 4)
- {
- if(!$print)
- {
- ob_start();
- }
- print_r($array);
- if(!$print)
- {
- $v = ob_get_contents();
- ob_end_clean();
- return $v;
- }
- }
- else
- {
- return print_r($array,$print);
- }
- }
-
- /*!
- @collection_end direct functions
- */
-
- // print_debug('core functions are done');
-
/****************************************************************************\
- * Quick verification of sane environment
*
-
\****************************************************************************/
- // error_reporting(7);
/* Make sure the header.inc.php is current. */
if ($GLOBALS['phpgw_info']['server']['versions']['header'] <
$GLOBALS['phpgw_info']['server']['versions']['current_header'])
--- 55,58 ----
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/inc common_functions.inc.php,NONE,1.16.2.1 functions.inc.php,1.121.2.13.2.1,1.121.2.13.2.2,
Ralf Becker <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: phpgwapi/setup setup.inc.php,1.37.2.6,1.37.2.6.2.1 tables_update.inc.php,1.53.2.9,1.53.2.9.2.1
- Next by Date:
[Phpgroupware-cvs] CVS: filemanager/inc hook_preferences.inc.php,1.9,1.10
- Previous by thread:
[Phpgroupware-cvs] CVS: phpgwapi/setup setup.inc.php,1.37.2.6,1.37.2.6.2.1 tables_update.inc.php,1.53.2.9,1.53.2.9.2.1
- Next by thread:
[Phpgroupware-cvs] CVS: filemanager/inc hook_preferences.inc.php,1.9,1.10
- Index(es):