mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-25 16:19:00 +01:00
Fixed some variables being treated has strings becuase of things like "$somevar"
This commit is contained in:
parent
2e3edb1a1e
commit
5a4e1a11a1
@ -40,11 +40,12 @@
|
||||
return $s;
|
||||
}
|
||||
|
||||
function return_array($type = "all")
|
||||
function return_array($type = "all", $id = "")
|
||||
{
|
||||
$filter = $this->filter($type);
|
||||
if (gettype($type) == "integer") {
|
||||
$filter = " and cat_id='$type'";
|
||||
|
||||
if ($type == "single") {
|
||||
$filter = " and cat_id='$id'";
|
||||
}
|
||||
|
||||
$this->db->query("select * from phpgw_categories where cat_owner='"
|
||||
@ -115,7 +116,7 @@
|
||||
. $this->account_id . "'",__LINE__,__FILE__);
|
||||
}
|
||||
|
||||
function edit($cat_id,$cat_parent,$cat_name,$cat_description,$cat_data)
|
||||
function edit($cat_id,$cat_parent,$cat_name,$cat_description = "",$cat_data = "")
|
||||
{
|
||||
$this->db->query("update phpgw_categories set cat_name='" . addslashes($cat_name) . "', "
|
||||
. "cat_description='" . addslashes($cat_description) . "', cat_data='"
|
||||
|
@ -79,7 +79,7 @@
|
||||
$value = $$var;
|
||||
}
|
||||
|
||||
$this->data["$app_name"]["$var"] = $value;
|
||||
$this->data[$app_name][$var] = $value;
|
||||
reset($this->data);
|
||||
return $this->data;
|
||||
}
|
||||
@ -87,9 +87,9 @@
|
||||
function delete($app_name, $var = "")
|
||||
{
|
||||
if ($var == "") {
|
||||
$this->data["$app_name"] = array();
|
||||
$this->data[$app_name] = array();
|
||||
} else {
|
||||
unset($this->data["$app_name"]["$var"]);
|
||||
unset($this->data[$app_name][$var]);
|
||||
}
|
||||
reset ($this->data);
|
||||
return $this->data;
|
||||
|
Loading…
Reference in New Issue
Block a user