← All changes | callback/wings/watch.php +20 -20 5.41 → 4.84 View file →

		@@ -6,9 +6,9 @@
6	6	class BVWatchCallback extends BVCallbackBase {
7	7	public $db;
8	8	public $settings;
9	9
10		- const WATCH_WING_VERSION = 1.3;
	10	+ const WATCH_WING_VERSION = 1.1;
11	11
12	12	public function __construct($callback_handler) {
13	13	$this->db = $callback_handler->db;
14	14	$this->settings = $callback_handler->settings;
		@@ -90,15 +90,15 @@
90	90	case "getdata":
91	91	$resp = array();
92	92
93	93	if (array_key_exists('lp', $params)) {
94		- require_once dirname( __FILE__ ) . '/../../protect/lp.php';
	94	+ require_once dirname( __FILE__ ) . '/../../protect/wp/lp/config.php';
95	95	$lp_params = $params['lp'];
96		- if (!isset($lp_params['bv_check_table']) || $db->isTablePresent($db->getBVTable(WPRProtectLP_V541::TABLE_NAME))) {
97		- $limit = intval($lp_params['limit']);
98		- $filter = $lp_params['filter'];
99		- $db->deleteBVTableContent(WPRProtectLP_V541::TABLE_NAME, $lp_params['rmfilter']);
100		- $table = $db->getBVTable(WPRProtectLP_V541::TABLE_NAME);
	96	+ if (!isset($lp_params['bv_check_table']) || $db->isTablePresent($db->getBVTable(BVWPLPConfig::$requests_table))) {
	97	+ $limit = intval(urldecode($lp_params['limit']));
	98	+ $filter = urldecode($lp_params['filter']);
	99	+ $db->deleteBVTableContent(BVWPLPConfig::$requests_table, $lp_params['rmfilter']);
	100	+ $table = $db->getBVTable(BVWPLPConfig::$requests_table);
101	101	$resp["lplogs"] = $this->getData($table, $limit, $filter);
102	102	} else {
103	103	$resp["lplogs"] = array("status" => "TABLE_NOT_PRESENT");
104	104	}
		@@ -109,15 +109,15 @@
109	109	$resp["prelog"] = $this->getFWPrependLog($prelog_params);
110	110	}
111	111
112	112	if (array_key_exists('fw', $params)) {
113		- require_once dirname( __FILE__ ) . '/../../protect/fw.php';
	113	+ require_once dirname( __FILE__ ) . '/../../protect/fw/config.php';
114	114	$fw_params = $params['fw'];
115		- if (!isset($fw_params['bv_check_table']) || $db->isTablePresent($db->getBVTable(WPRProtectFW_V541::TABLE_NAME))) {
116		- $limit = intval($fw_params['limit']);
117		- $filter = $fw_params['filter'];
118		- $db->deleteBVTableContent(WPRProtectFW_V541::TABLE_NAME, $fw_params['rmfilter']);
119		- $table = $db->getBVTable(WPRProtectFW_V541::TABLE_NAME);
	115	+ if (!isset($fw_params['bv_check_table']) || $db->isTablePresent($db->getBVTable(BVFWConfig::$requests_table))) {
	116	+ $limit = intval(urldecode($fw_params['limit']));
	117	+ $filter = urldecode($fw_params['filter']);
	118	+ $db->deleteBVTableContent(BVFWConfig::$requests_table, $fw_params['rmfilter']);
	119	+ $table = $db->getBVTable(BVFWConfig::$requests_table);
120	120	$resp["fwlogs"] = $this->getData($table, $limit, $filter);
121	121	} else {
122	122	$resp["fwlogs"] = array("status" => "TABLE_NOT_PRESENT");
123	123	}
		@@ -127,10 +127,10 @@
127	127	require_once dirname( __FILE__ ) . '/../../wp_dynsync.php';
128	128	$isdynsyncactive = $settings->getOption('bvDynSyncActive');
129	129	if ($isdynsyncactive == 'yes') {
130	130	if (!isset($params['bv_check_table']) || $db->isTablePresent($db->getBVTable(BVWPDynSync::$dynsync_table))) {
131		- $limit = intval($params['limit']);
132		- $filter = $params['filter'];
	131	+ $limit = intval(urldecode($params['limit']));
	132	+ $filter = urldecode($params['filter']);
133	133	$this->deleteBvDynamicEvents($params['rmfilter']);
134	134	$table = $db->getBVTable(BVWPDynSync::$dynsync_table);
135	135	$data = $this->getData($table, $limit, $filter);
136	136	$resp['last_id'] = $data['last_id'];
		@@ -144,10 +144,10 @@
144	144	if (array_key_exists('actlog', $params)) {
145	145	require_once dirname( __FILE__ ) . '/../../wp_actlog.php';
146	146	$actlog_params = $params['actlog'];
147	147	if (!isset($actlog_params['bv_check_table']) || $db->isTablePresent($db->getBVTable(BVWPActLog::$actlog_table))) {
148		- $limit = intval($actlog_params['limit']);
149		- $filter = $actlog_params['filter'];
	148	+ $limit = intval(urldecode($actlog_params['limit']));
	149	+ $filter = urldecode($actlog_params['filter']);
150	150	$db->deleteBVTableContent(BVWPActLog::$actlog_table, $actlog_params['rmfilter']);
151	151	$table = $db->getBVTable(BVWPActLog::$actlog_table);
152	152	$resp["actlogs"] = $this->getData($table, $limit, $filter);
153	153	} else {
		@@ -159,10 +159,10 @@
159	159	$airlift_stats_table = "airlift_stats";
160	160	$airlift_stats_params = $params['airlift_stats'];
161	161	$table = $db->getBVTable($airlift_stats_table);
162	162	if (!isset($airlift_stats_params['bv_check_table']) || $db->isTablePresent($table)) {
163		- $limit = intval($airlift_stats_params['limit']);
164		- $filter = $airlift_stats_params['filter'];
	163	+ $limit = intval(urldecode($airlift_stats_params['limit']));
	164	+ $filter = urldecode($airlift_stats_params['filter']);
165	165	$db->deleteBVTableContent($airlift_stats_table, $airlift_stats_params['rmfilter']);
166	166	$resp["airlift_stats"] = $this->getData($table, $limit, $filter);
167	167	} else {
168	168	$resp["airlift_stats"] = array("status" => "TABLE_NOT_PRESENT");
		@@ -171,9 +171,9 @@
171	171	$resp["status"] = "done";
172	172	break;
173	173	case "rmdata":
174	174	require_once dirname( __FILE__ ) . '/../../wp_dynsync.php';
175		- $filter = $params['filter'];
	175	+ $filter = urldecode($params['filter']);
176	176	$resp = array("status" => $this->deleteBvDynamicEvents($filter));
177	177	break;
178	178	default:
179	179	$resp = false;