diff options
Diffstat (limited to 'library/spam/b8/storage/storage_base.php')
| -rw-r--r-- | library/spam/b8/storage/storage_base.php | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/library/spam/b8/storage/storage_base.php b/library/spam/b8/storage/storage_base.php index 01f5a69d7..49132751b 100644 --- a/library/spam/b8/storage/storage_base.php +++ b/library/spam/b8/storage/storage_base.php @@ -71,10 +71,10 @@ abstract class b8_storage_base * @return mixed Returns TRUE if everything is okay, otherwise an error code. */ - protected function check_database() + protected function check_database($uid) { - $internals = $this->get_internals(); + $internals = $this->get_internals($uid); if(isset($internals['dbversion'])) { if($internals['dbversion'] == "2") { @@ -122,7 +122,7 @@ abstract class b8_storage_base * @return array Returns an array of all internals. */ - public function get_internals() + public function get_internals($uid) { $internals = $this->_get_query( @@ -130,7 +130,8 @@ abstract class b8_storage_base self::INTERNALS_TEXTS_HAM, self::INTERNALS_TEXTS_SPAM, self::INTERNALS_DBVERSION - ) + ), + $uid ); return array( @@ -149,7 +150,7 @@ abstract class b8_storage_base * @return mixed Returns FALSE on failure, otherwise returns array of returned data in the format array('tokens' => array(token => count), 'degenerates' => array(token => array(degenerate => count))). */ - public function get($tokens) + public function get($tokens, $uid) { # Validate the startup @@ -160,7 +161,7 @@ abstract class b8_storage_base return $started_up; # First we see what we have in the database. - $token_data = $this->_get_query($tokens); + $token_data = $this->_get_query($tokens, $uid); # Check if we have to degenerate some tokens @@ -203,7 +204,7 @@ abstract class b8_storage_base $return_data_tokens[$token] = $this->_parse_count($token_data[$token]); # ... and update it's lastseen parameter - $this->_update($token, "{$return_data_tokens[$token]['count_ham']} {$return_data_tokens[$token]['count_spam']} " . $this->b8_config['today']); + $this->_update($token, "{$return_data_tokens[$token]['count_ham']} {$return_data_tokens[$token]['count_spam']} " . $this->b8_config['today'], $uid ); } @@ -224,7 +225,7 @@ abstract class b8_storage_base $return_data_degenerates[$token][$degenerate] = $this->_parse_count($token_data[$degenerate]); # ... and update it's lastseen parameter - $this->_update($degenerate, "{$return_data_degenerates[$token][$degenerate]['count_ham']} {$return_data_degenerates[$token][$degenerate]['count_spam']} " . $this->b8_config['today']); + $this->_update($degenerate, "{$return_data_degenerates[$token][$degenerate]['count_ham']} {$return_data_degenerates[$token][$degenerate]['count_spam']} " . $this->b8_config['today'], $uid); } @@ -258,7 +259,7 @@ abstract class b8_storage_base * @return void */ - public function process_text($tokens, $category, $action) + public function process_text($tokens, $category, $action, $uid) { # Validate the startup @@ -271,10 +272,10 @@ abstract class b8_storage_base # No matter what we do, we first have to check what data we have. # First get the internals, including the ham texts and spam texts counter - $internals = $this->get_internals(); + $internals = $this->get_internals($uid); # Then, fetch all data for all tokens we have (and update their lastseen parameters) - $token_data = $this->_get_query(array_keys($tokens)); + $token_data = $this->_get_query(array_keys($tokens), $uid); # Process all tokens to learn/unlearn @@ -315,7 +316,7 @@ abstract class b8_storage_base # Now let's see if we have to update or delete the token if($count_ham !== 0 or $count_spam !== 0) - $this->_update($token, "$count_ham $count_spam " . $this->b8_config['today']); + $this->_update($token, "$count_ham $count_spam " . $this->b8_config['today'], $uid); else $this->_del($token); @@ -335,7 +336,7 @@ abstract class b8_storage_base $data .= $this->b8_config['today']; - $this->_put($token, $data); + $this->_put($token, $data, $uid); } @@ -349,12 +350,12 @@ abstract class b8_storage_base if($category === b8::HAM) { $internals['texts_ham']++; - $this->_update(self::INTERNALS_TEXTS_HAM, $internals['texts_ham']); + $this->_update(self::INTERNALS_TEXTS_HAM, $internals['texts_ham'], $uid); } elseif($category === b8::SPAM) { $internals['texts_spam']++; - $this->_update(self::INTERNALS_TEXTS_SPAM, $internals['texts_spam']); + $this->_update(self::INTERNALS_TEXTS_SPAM, $internals['texts_spam'], $uid); } } @@ -368,7 +369,7 @@ abstract class b8_storage_base if($internals['texts_ham'] < 0) $internals['texts_ham'] = 0; - $this->_update(self::INTERNALS_TEXTS_HAM, $internals['texts_ham']); + $this->_update(self::INTERNALS_TEXTS_HAM, $internals['texts_ham'], $uid); } @@ -379,7 +380,7 @@ abstract class b8_storage_base if($internals['texts_spam'] < 0) $internals['texts_spam'] = 0; - $this->_update(self::INTERNALS_TEXTS_SPAM, $internals['texts_spam']); + $this->_update(self::INTERNALS_TEXTS_SPAM, $internals['texts_spam'], $uid); } |