projects
/
curl-de-sac.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
swap 'cmd_cls' and 'ch' arguments in cmd creation
[curl-de-sac.git]
/
web
/
Obj
/
curl-de-sac.phh
diff --git
a/web/Obj/curl-de-sac.phh
b/web/Obj/curl-de-sac.phh
index
ac7744d
..
f791187
100644
(file)
--- a/
web/Obj/curl-de-sac.phh
+++ b/
web/Obj/curl-de-sac.phh
@@
-25,26
+25,33
@@
$G_curl_de_sac_version = "0.1";
class CDS_cmd {
$G_curl_de_sac_version = "0.1";
class CDS_cmd {
- var $ch;
var $cmd_cls;
var $cmd_cls;
+ var $ch;
- function CDS_cmd($c
h, $cmd_cls
)
+ function CDS_cmd($c
md_cls, $ch
)
{
{
- $this->ch = $ch;
$this->cmd_cls = $cmd_cls;
$this->cmd_cls = $cmd_cls;
+ $this->ch = $ch;
}
}
class CDS_cmd_cls {
}
}
class CDS_cmd_cls {
+ var $cds;
var $name;
var $tout;
function CDS_cmd_cls($name, $tout)
{
var $name;
var $tout;
function CDS_cmd_cls($name, $tout)
{
+ $this->cds = NULL;
$this->name = $name;
$this->tout = $tout;
}
$this->name = $name;
$this->tout = $tout;
}
+ function cds_set($cds)
+ {
+ $this->cds = $cds;
+ }
+
static function pre_create($url)
{
if (($ch = curl_init()) == FALSE)
static function pre_create($url)
{
if (($ch = curl_init()) == FALSE)
@@
-107,6
+114,7
@@
class Curl_de_sac {
return FALSE;
$this->cmd_cls[$cmd_cls->name] = $cmd_cls;
return FALSE;
$this->cmd_cls[$cmd_cls->name] = $cmd_cls;
+ $cmd_cls->cds_set($this);
return TRUE;
}
return TRUE;
}
@@
-118,12
+126,18
@@
class Curl_de_sac {
if (!isset($this->cmd_cls[$cmd_cls->name]))
return FALSE;
if (!isset($this->cmd_cls[$cmd_cls->name]))
return FALSE;
+ $this->cmd_cls[$cmd_cls->name]->cds_set(NULL);
+
unset($this->cmd_cls[$cmd_cls->name]);
return TRUE;
}
function cmd_deregister_all()
{
unset($this->cmd_cls[$cmd_cls->name]);
return TRUE;
}
function cmd_deregister_all()
{
+ foreach($this->cmd_cls as $cmd_cls) {
+ $cmd_cls->cds_set(NULL);
+ }
+
$this->cmd_cls = array();
}
$this->cmd_cls = array();
}