Bugfixing minor things in action class
This commit is contained in:
parent
63496c1347
commit
703fe35ef8
|
@ -43,7 +43,7 @@ class m_action {
|
||||||
/*
|
/*
|
||||||
* function to delete file / folder
|
* function to delete file / folder
|
||||||
*/
|
*/
|
||||||
function del($dir) {
|
function del($dir,$user="root") {
|
||||||
return $this->set('delete',$user, array('dir'=>$dir));
|
return $this->set('delete',$user, array('dir'=>$dir));
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
|
@ -102,13 +102,12 @@ class m_action {
|
||||||
$err->raise("action",_("Error setting actions"));
|
$err->raise("action",_("Error setting actions"));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
$purge="delete from actions where HOUR(now()) - HOUR(creation) > 1;";
|
$purge="select * from actions where TO_DAYS(curdate()) - TO_DAYS(creation) > 2;";
|
||||||
if(!$db->query($purge)){
|
if(!$db->query($purge)){
|
||||||
$err->raise("action",_("Error purging old actions"));
|
$err->raise("action",_("Error purging old actions"));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -123,7 +122,6 @@ class m_action {
|
||||||
$tab[]=$db->Record;
|
$tab[]=$db->Record;
|
||||||
return $tab;
|
return $tab;
|
||||||
}else{
|
}else{
|
||||||
$err->raise("action",_("Error selecting new action"));
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -132,8 +130,8 @@ class m_action {
|
||||||
*/
|
*/
|
||||||
function begin($id) {
|
function begin($id) {
|
||||||
global $db,$err;
|
global $db,$err;
|
||||||
if($db->query("update actions set begin=now() where id=$id ")){
|
if(!$db->query("update actions set begin=now() where id=$id ;")){
|
||||||
$err->raise("action",_("Error in setting locking the action : $id"));
|
$err->raise("action",_("Error locking the action : $id"));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
@ -143,8 +141,7 @@ class m_action {
|
||||||
*/
|
*/
|
||||||
function finish($id,$return=0) {
|
function finish($id,$return=0) {
|
||||||
global $db,$err;
|
global $db,$err;
|
||||||
$return=intval($return);
|
if(!$db->query("update actions set end=now(),status='$return' where id=$id ;")){
|
||||||
if($db->query("update actions set end=now(),status=$return where id=$id")){
|
|
||||||
$err->raise("action",_("Error unlocking the action : $id"));
|
$err->raise("action",_("Error unlocking the action : $id"));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue