refactor code, and correct return true, which may be false because of do_action()
This commit is contained in:
		
							parent
							
								
									7ef2d8bd0d
								
							
						
					
					
						commit
						64fa8a2795
					
				| 
						 | 
				
			
			@ -185,37 +185,24 @@ class m_action {
 | 
			
		|||
        $err->log("action", "set", $type);
 | 
			
		||||
 | 
			
		||||
        $serialized = serialize($parameters);
 | 
			
		||||
        switch ($type) {
 | 
			
		||||
            case 'create_file':
 | 
			
		||||
                $query = "insert into actions values ('','CREATE_FILE','$serialized',now(),'','','$user','');";
 | 
			
		||||
                break;
 | 
			
		||||
            case 'create_dir':
 | 
			
		||||
                $query = "insert into actions values ('','CREATE_DIR','$serialized',now(),'','','$user','');";
 | 
			
		||||
                break;
 | 
			
		||||
            case 'move':
 | 
			
		||||
                $query = "insert into actions values ('','MOVE','$serialized',now(),'','','$user','');";
 | 
			
		||||
                break;
 | 
			
		||||
            case 'fix_user':
 | 
			
		||||
                $query = "insert into actions values ('','FIX_USER','$serialized',now(),'','','$user','');";
 | 
			
		||||
                break;
 | 
			
		||||
            case 'fix_file':
 | 
			
		||||
                $query = "insert into actions values ('','FIX_FILE','$serialized',now(),'','','$user','');";
 | 
			
		||||
                break;
 | 
			
		||||
            case 'fix_dir':
 | 
			
		||||
                $query = "insert into actions values ('','FIX_DIR','$serialized',now(),'','','$user','');";
 | 
			
		||||
                break;
 | 
			
		||||
            case 'delete':
 | 
			
		||||
                $query = "insert into actions values ('','DELETE','$serialized',now(),'','','$user','');";
 | 
			
		||||
                break;
 | 
			
		||||
            default:
 | 
			
		||||
                return false;
 | 
			
		||||
	$type = strtoupper($type);
 | 
			
		||||
	if (in_array($type, array('CREATE_FILE', 
 | 
			
		||||
				  'CREATE_DIR', 
 | 
			
		||||
				  'MOVE', 
 | 
			
		||||
				  'FIX_USER', 
 | 
			
		||||
				  'FIX_FILE', 
 | 
			
		||||
				  'FIX_DIR', 
 | 
			
		||||
				  'DELETE'))) {
 | 
			
		||||
	  $query = 'INSERT INTO `actions` (type, parameters, creation, user) VALUES(?, ?, now())';
 | 
			
		||||
	} else {
 | 
			
		||||
	  return false;
 | 
			
		||||
        }
 | 
			
		||||
        if (!$db->query($query)) {
 | 
			
		||||
 | 
			
		||||
        if (!$db->query($query, array($type, $serialized))) {
 | 
			
		||||
            $err->raise("action", _("Error setting actions"));
 | 
			
		||||
            return false;
 | 
			
		||||
        }
 | 
			
		||||
        $this->do_action();
 | 
			
		||||
        return true;
 | 
			
		||||
        return $this->do_action();
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue