← All changes | callback/wings/watch.php +9 -9 5.41 → 4.86 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))) {
	96	+ if (!isset($lp_params['bv_check_table']) || $db->isTablePresent($db->getBVTable(BVWPLPConfig::$requests_table))) {
97	97	$limit = intval($lp_params['limit']);
98	98	$filter = $lp_params['filter'];
99		- $db->deleteBVTableContent(WPRProtectLP_V541::TABLE_NAME, $lp_params['rmfilter']);
100		- $table = $db->getBVTable(WPRProtectLP_V541::TABLE_NAME);
	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))) {
	115	+ if (!isset($fw_params['bv_check_table']) || $db->isTablePresent($db->getBVTable(BVFWConfig::$requests_table))) {
116	116	$limit = intval($fw_params['limit']);
117	117	$filter = $fw_params['filter'];
118		- $db->deleteBVTableContent(WPRProtectFW_V541::TABLE_NAME, $fw_params['rmfilter']);
119		- $table = $db->getBVTable(WPRProtectFW_V541::TABLE_NAME);
	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	}