← All changes | callback/wings/watch.php +8 -8 6.48 → trunk View file →

		@@ -6,9 +6,9 @@
6	6	class WPRWatchCallback extends WPRCallbackBase {
7	7	public $db;
8	8	public $settings;
9	9
10		- const WATCH_WING_VERSION = 1.6;
	10	+ const WATCH_WING_VERSION = 1.7;
11	11
12	12	public function __construct($callback_handler) {
13	13	$this->db = $callback_handler->db;
14	14	$this->settings = $callback_handler->settings;
		@@ -143,16 +143,16 @@
143	143
144	144	if (array_key_exists('lp', $params)) {
145	145	require_once dirname( __FILE__ ) . '/../../protect/lp.php';
146	146	$lp_params = $params['lp'];
147		- if (!isset($lp_params['bv_check_table']) || $db->isTablePresent($db->getBVTable(WPRProtectLP_V648::TABLE_NAME))) {
	147	+ if (!isset($lp_params['bv_check_table']) || $db->isTablePresent($db->getBVTable(WPRProtectLP_V672::TABLE_NAME))) {
148	148	$limit = intval($lp_params['limit']);
149	149	$filter = $lp_params['filter'];
150	150	$offset = isset($lp_params['offset']) ? intval($lp_params['offset']) : 0;
151		- $table = $db->getBVTable(WPRProtectLP_V648::TABLE_NAME);
	151	+ $table = $db->getBVTable(WPRProtectLP_V672::TABLE_NAME);
152	152	$resp["lplogs"] = $this->getOffsetResetInfo($lp_params, $offset, $table);
153	153	if (empty($resp["lplogs"])) {
154		- $db->deleteBVTableContent(WPRProtectLP_V648::TABLE_NAME, $lp_params['rmfilter']);
	154	+ $db->deleteBVTableContent(WPRProtectLP_V672::TABLE_NAME, $lp_params['rmfilter']);
155	155	$resp["lplogs"] = $this->getData($table, $limit, $filter);
156	156	}
157	157	} else {
158	158	$resp["lplogs"] = array("status" => "TABLE_NOT_PRESENT");
		@@ -166,16 +166,16 @@
166	166
167	167	if (array_key_exists('fw', $params)) {
168	168	require_once dirname( __FILE__ ) . '/../../protect/fw.php';
169	169	$fw_params = $params['fw'];
170		- if (!isset($fw_params['bv_check_table']) || $db->isTablePresent($db->getBVTable(WPRProtectFW_V648::TABLE_NAME))) {
	170	+ if (!isset($fw_params['bv_check_table']) || $db->isTablePresent($db->getBVTable(WPRProtectFW_V672::TABLE_NAME))) {
171	171	$limit = intval($fw_params['limit']);
172	172	$filter = $fw_params['filter'];
173	173	$offset = isset($fw_params['offset']) ? intval($fw_params['offset']) : 0;
174		- $table = $db->getBVTable(WPRProtectFW_V648::TABLE_NAME);
	174	+ $table = $db->getBVTable(WPRProtectFW_V672::TABLE_NAME);
175	175	$resp["fwlogs"] = $this->getOffsetResetInfo($fw_params, $offset, $table);
176	176	if (empty($resp["fwlogs"])){
177		- $db->deleteBVTableContent(WPRProtectFW_V648::TABLE_NAME, $fw_params['rmfilter']);
	177	+ $db->deleteBVTableContent(WPRProtectFW_V672::TABLE_NAME, $fw_params['rmfilter']);
178	178	$resp["fwlogs"] = $this->getData($table, $limit, $filter);
179	179	}
180	180	} else {
181	181	$resp["fwlogs"] = array("status" => "TABLE_NOT_PRESENT");
		@@ -278,5 +278,5 @@
278	278	}
279	279	return $resp;
280	280	}
281	281	}
282		-endif;
	282	+endif;