| @@ -8,11 +8,8 @@ | ||
| 8 | 8 | public static $actlog_table = 'activities_store'; |
| 9 | 9 | public $db; |
| 10 | 10 | public $settings; |
| 11 | 11 | public $bvinfo; |
| 12 | - public $request_id; | |
| 13 | - public $ip_header; | |
| 14 | - public $ignored_events; | |
| 15 | 12 | |
| 16 | 13 | public function __construct($db, $settings, $info, $config) { |
| 17 | 14 | $this->db = $db; |
| 18 | 15 | $this->settings = $settings; |
| @@ -119,11 +116,11 @@ | ||
| 119 | 116 | $ip = $_SERVER['REMOTE_ADDR']; |
| 120 | 117 | } |
| 121 | 118 | |
| 122 | 119 | $ip = trim($ip); |
| 123 | - if (WPRHelper::safePregMatch('/^\[([0-9a-fA-F:]+)\](:[0-9]+)$/', $ip, $matches)) { | |
| 120 | + if (preg_match('/^\[([0-9a-fA-F:]+)\](:[0-9]+)$/', $ip, $matches)) { | |
| 124 | 121 | $ip = $matches[1]; |
| 125 | - } elseif (WPRHelper::safePregMatch('/^([0-9.]+)(:[0-9]+)$/', $ip, $matches)) { | |
| 122 | + } elseif (preg_match('/^([0-9.]+)(:[0-9]+)$/', $ip, $matches)) { | |
| 126 | 123 | $ip = $matches[1]; |
| 127 | 124 | } |
| 128 | 125 | |
| 129 | 126 | return $ip; |
| @@ -152,9 +149,9 @@ | ||
| 152 | 149 | function is_key_ignored($ignored_keys, $value) { |
| 153 | 150 | $is_ignored = false; |
| 154 | 151 | if (array_key_exists("post_types_regex", $ignored_keys)) { |
| 155 | 152 | foreach ($ignored_keys['post_types_regex'] as $val) { |
| 156 | - if (WPRHelper::safePregMatch($val, $value)) { | |
| 153 | + if (preg_match($val, $value)) { | |
| 157 | 154 | return true; |
| 158 | 155 | } |
| 159 | 156 | } |
| 160 | 157 | } |