Menu
▾
▴
[Xoops-cvs2] xoops2/kernel/object/object object.php,1.2,1.3
|
From: <ok...@us...> - 2003-01-05 18:25:23
|
Update of /cvsroot/xoops/xoops2/kernel/object/object
In directory sc8-pr-cvs1:/tmp/cvs-serv17192/kernel/object/object
Modified Files:
object.php
Log Message:
added assignvar() and assignVars() to XoopsObject and its child classes
Index: object.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/kernel/object/object/object.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** object.php 5 Jan 2003 13:55:47 -0000 1.2
--- object.php 5 Jan 2003 18:25:19 -0000 1.3
***************
*** 136,147 ****
// public
// assign a value to a variable
! function setVar($key, $value, $changed = true)
{
if (!empty($key) && isset($value) && isset($this->vars[$key])) {
$this->vars[$key]['value'] =& $value;
- $this->vars[$key]['changed'] = $changed;
- if ($changed) {
- $this->setDirty();
- }
}
}
--- 136,143 ----
// public
// assign a value to a variable
! function assignVar($key, $value)
{
if (!empty($key) && isset($value) && isset($this->vars[$key])) {
$this->vars[$key]['value'] =& $value;
}
}
***************
*** 149,156 ****
// private
// assign values to multiple variables in a batch
! function setVars($vararr, $changed = true)
{
! foreach ($vararr as $key => $value) {
! $this->setVar($key, $value, $changed);
}
}
--- 145,173 ----
// private
// assign values to multiple variables in a batch
! function assignVars($var_arr)
{
! foreach ($var_arr as $key => $value) {
! $this->assignVar($key, $value);
! }
! }
!
! // public
! // assign a value to a variable
! function setVar($key, $value, $force_slash = false)
! {
! if (!empty($key) && isset($value) && isset($this->vars[$key])) {
! $this->vars[$key]['value'] =& $value;
! $this->vars[$key]['force_slash'] = $force_slash;
! $this->vars[$key]['changed'] = true;
! $this->setDirty();
! }
! }
!
! // private
! // assign values to multiple variables in a batch
! function setVars($var_arr, $force_slash = false)
! {
! foreach ($var_arr as $key => $value) {
! $this->setVar($key, $value, $force_slash);
}
}
***************
*** 285,295 ****
$cleanv = addslashes($v['value']);
} else {
- if ($v['required'] && $v['value'] == '') {
- $this->setErrors("$k is required.");
- continue;
- }
$cleanv = is_string($v['value']) ? trim($v['value']) : $v['value'];
switch ($v['data_type']) {
case XOBJ_DTYPE_TXTBOX:
if (isset($v['maxlength']) && strlen($cleanv) > intval($v['maxlength'])) {
$this->setErrors("$k must be shorter than ".intval($v['maxlength'])." characters.");
--- 302,312 ----
$cleanv = addslashes($v['value']);
} else {
$cleanv = is_string($v['value']) ? trim($v['value']) : $v['value'];
switch ($v['data_type']) {
case XOBJ_DTYPE_TXTBOX:
+ if ($v['required'] && $cleanv == '') {
+ $this->setErrors("$k is required.");
+ continue;
+ }
if (isset($v['maxlength']) && strlen($cleanv) > intval($v['maxlength'])) {
$this->setErrors("$k must be shorter than ".intval($v['maxlength'])." characters.");
***************
*** 304,310 ****
// }
//}
! $cleanv =& $ts->addSlashes($ts->censorString($cleanv));
break;
case XOBJ_DTYPE_TXTAREA:
//foreach ($this->_filters as $filter) {
// if (!isset($filterreg[$filter])) {
--- 321,331 ----
// }
//}
! $cleanv =& (!$v['force_slash']) ? $ts->addSlashes($ts->censorString($cleanv)) : addslashes($ts->censorString($cleanv));
break;
case XOBJ_DTYPE_TXTAREA:
+ if ($v['required'] && $cleanv == '') {
+ $this->setErrors("$k is required.");
+ continue;
+ }
//foreach ($this->_filters as $filter) {
// if (!isset($filterreg[$filter])) {
***************
*** 315,322 ****
// }
//}
! $cleanv =& $ts->addSlashes($ts->censorString($cleanv));
break;
case XOBJ_DTYPE_SOURCE:
! $cleanv =& $ts->addSlashes($cleanv);
break;
case XOBJ_DTYPE_INT:
--- 336,343 ----
// }
//}
! $cleanv =& (!$v['force_slash']) ? $ts->addSlashes($ts->censorString($cleanv)) : addslashes($ts->censorString($cleanv));
break;
case XOBJ_DTYPE_SOURCE:
! $cleanv =& (!$v['force_slash']) ? $ts->addSlashes($ts->censorString($cleanv)) : addslashes($ts->censorString($cleanv));
break;
case XOBJ_DTYPE_INT:
***************
*** 324,338 ****
break;
case XOBJ_DTYPE_EMAIL:
if (!preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+([\.][a-z0-9-]+)+$/i",$cleanv)) {
$this->setErrors("Invalid Email");
continue;
}
! $cleanv =& $ts->addSlashes($ts->censorString($cleanv));
break;
case XOBJ_DTYPE_URL:
if ($cleanv != '' && !preg_match("/^http[s]*:\/\//i", $cleanv)) {
$cleanv = 'http://' . $cleanv;
}
! $cleanv =& $ts->addSlashes($ts->censorString($cleanv));
break;
case XOBJ_DTYPE_ARRAY:
--- 345,367 ----
break;
case XOBJ_DTYPE_EMAIL:
+ if ($v['required'] && $cleanv == '') {
+ $this->setErrors("$k is required.");
+ continue;
+ }
if (!preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+([\.][a-z0-9-]+)+$/i",$cleanv)) {
$this->setErrors("Invalid Email");
continue;
}
! $cleanv =& (!$v['force_slash']) ? $ts->addSlashes($ts->censorString($cleanv)) : addslashes($ts->censorString($cleanv));
break;
case XOBJ_DTYPE_URL:
+ if ($v['required'] && $cleanv == '') {
+ $this->setErrors("$k is required.");
+ continue;
+ }
if ($cleanv != '' && !preg_match("/^http[s]*:\/\//i", $cleanv)) {
$cleanv = 'http://' . $cleanv;
}
! $cleanv =& (!$v['force_slash']) ? $ts->addSlashes($ts->censorString($cleanv)) : addslashes($ts->censorString($cleanv));
break;
case XOBJ_DTYPE_ARRAY:
|
