Skip to content

Commit 0ed197c

Browse files
thompatacsilthompatacsil
committed
Consolidated standard variables to goAPI.php
1 parent 3827352 commit 0ed197c

12 files changed

+17
-70
lines changed

‎goStateCallTimes/goAddStateCallTimes.php

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
* You should have received a copy of the GNU Affero General Public License
2121
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2222
*/
23+
include_once ("goAPI.php");
2324

2425
### POST or GET Variables
2526
$state_call_time_id = $astDB->escape($_REQUEST['state_call_time_id']);
@@ -43,12 +44,6 @@
4344
$sct_saturday_start = $astDB->escape($_REQUEST['sct_saturday_start']);
4445
$sct_saturday_stop = $astDB->escape($_REQUEST['sct_saturday_stop']);
4546
$user_group = $astDB->escape($_REQUEST['user_group']);
46-
$ip_address = $astDB->escape($_REQUEST['hostname']);
47-
$goUser = $astDB->escape($_REQUEST['goUser']);
48-
49-
$log_user = $astDB->escape($_REQUEST['log_user']);
50-
$log_group = $astDB->escape($_REQUEST['log_group']);
51-
5247

5348
### Default values
5449

@@ -168,7 +163,7 @@
168163
);
169164
$rsltv = $astDB->insert('vicidial_state_call_times', $insertData);
170165

171-
$log_id = log_action($goDB, 'ADD', $log_user, $ip_address, "Added New State Call Time: $state_call_time_id", $log_group, $newQuery);
166+
$log_id = log_action($goDB, 'ADD', $log_user, $log_ip, "Added New State Call Time: $state_call_time_id", $log_group, $newQuery);
172167

173168
if($rsltv == false){
174169
$apiresults = array("result" => "Error: Add failed, check your details");

‎goStateCallTimes/goDeleteStateCallTimes.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,10 @@
2020
* You should have received a copy of the GNU Affero General Public License
2121
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2222
*/
23+
include_once ("goAPI.php");
2324

2425
### POST or GET Variables
2526
$state_call_time_id = $astDB->escape($_REQUEST['state_call_time_id']);
26-
$ip_address = $astDB->escape($_REQUEST['hostname']);
27-
28-
$log_user = $astDB->escape($_REQUEST['log_user']);
29-
$log_group = $astDB->escape($_REQUEST['log_group']);
3027

3128
### Check Voicemail ID if its null or empty
3229
if($state_call_time_id == null) {
@@ -53,7 +50,7 @@
5350
$astDB->where('state_call_time_id', $state_call_time_id);
5451
$astDB->delete('vicidial_state_call_times');
5552

56-
$log_id = log_action($goDB, 'DELETE', $log_user, $ip_address, "Deleted State Call Time: $state_call_time_id", $log_group, $astDB->getLastQuery());
53+
$log_id = log_action($goDB, 'DELETE', $log_user, $log_ip, "Deleted State Call Time: $state_call_time_id", $log_group, $astDB->getLastQuery());
5754
$apiresults = array("result" => "success");
5855
} else {
5956
$apiresults = array("result" => "Error: State Call Menu doesn't exist.");

‎goStateCallTimes/goEditStateCallTimes.php

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
* You should have received a copy of the GNU Affero General Public License
2121
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2222
*/
23+
include_once ("goAPI.php");
2324

2425
### POST or GET Variables
2526
$state_call_time_id = $astDB->escape($_REQUEST['state_call_time_id']);
@@ -43,12 +44,6 @@
4344
$sct_saturday_start = $astDB->escape($_REQUEST['sct_saturday_start']);
4445
$sct_saturday_stop = $astDB->escape($_REQUEST['sct_saturday_stop']);
4546
$user_group = $astDB->escape($_REQUEST['user_group']);
46-
$ip_address = $astDB->escape($_REQUEST['hostname']);
47-
$goUser = $astDB->escape($_REQUEST['goUser']);
48-
49-
$log_user = $astDB->escape($_REQUEST['log_user']);
50-
$log_group = $astDB->escape($_REQUEST['log_group']);
51-
5247

5348
### ERROR CHECKING ...
5449
if($state_call_time_id == null || strlen($state_call_time_id) < 3) {
@@ -212,7 +207,7 @@
212207
$apiresults = array("result" => "Error: Try updating State Call Times Again");
213208
} else {
214209
$apiresults = array("result" => "success");
215-
$log_id = log_action($goDB, 'MODIFY', $log_user, $ip_address, "Modified State Call Time: $state_call_time_id", $log_group, $astDB->getLastQuery());
210+
$log_id = log_action($goDB, 'MODIFY', $log_user, $log_ip, "Modified State Call Time: $state_call_time_id", $log_group, $astDB->getLastQuery());
216211
}
217212
} else {
218213
$apiresults = array("result" => "Error: State Call Times doesn't exist");

‎goUploadLeads/goReadUpload.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
* You should have received a copy of the GNU Affero General Public License
2020
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2121
*/
22+
include_once ("goAPI.php");
2223

2324
ini_set('memory_limit','1024M');
2425
ini_set('upload_max_filesize', '6000M');
@@ -31,9 +32,6 @@
3132
$theList = $_REQUEST["goListId"];
3233
$goDupcheck = $_REQUEST["goDupcheck"];
3334
$default_delimiter = ",";
34-
$log_user = $astDB->escape($_REQUEST['log_user']);
35-
$log_group = $astDB->escape($_REQUEST['log_group']);
36-
$ip_address = $astDB->escape($_REQUEST['hostname']);
3735

3836
// path where your CSV file is located
3937
define('CSV_PATH','/tmp/');

‎goUploadLeads/goUploadMe.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
* You should have received a copy of the GNU Affero General Public License
2121
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2222
*/
23+
include_once ("goAPI.php");
2324

2425
ini_set('memory_limit','1024M');
2526
ini_set('upload_max_filesize', '600M');
@@ -32,9 +33,6 @@
3233
$goCountInsertedLeads = 0;
3334
$default_delimiter = ",";
3435
$phone_code_override = $astDB->escape($_REQUEST["phone_code_override"]);
35-
$log_user = $astDB->escape($_REQUEST['log_user']);
36-
$log_group = $astDB->escape($_REQUEST['log_group']);
37-
$ip_address = $astDB->escape($_REQUEST['hostname']);
3836

3937
$lead_mapping = NULL;
4038
if(!empty($_REQUEST["lead_mapping"]))
@@ -721,7 +719,7 @@
721719
$apiresults = array("result" => "error", "message" => "$goCountInsertedLeads", "duplicates" => $duplicates, "alex_data" => $alex);
722720
}
723721

724-
$log_id = log_action($goDB, 'UPLOAD', $log_user, $ip_address, "Uploaded {$goCountInsertedLeads} leads on List ID $theList", $log_group);
722+
$log_id = log_action($goDB, 'UPLOAD', $log_user, $log_ip, "Uploaded {$goCountInsertedLeads} leads on List ID $theList", $log_group);
725723

726724
} // END IF handle
727725

‎goUploadLeads/goUploadMeJSON.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,14 @@
2020
* You should have received a copy of the GNU Affero General Public License
2121
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2222
*/
23-
23+
include_once ("goAPI.php");
24+
2425
ini_set('memory_limit','1024M');
2526
ini_set('upload_max_filesize', '6000M');
2627
ini_set('post_max_size', '6000M');
2728

2829
$goDupcheck = $astDB->escape($_REQUEST["goDupcheck"]);
2930
$jsonDataRequest = json_decode($_REQUEST['jsonData'], true);
30-
$log_user = $astDB->escape($_REQUEST['log_user']);
31-
$log_group = $astDB->escape($_REQUEST['log_group']);
32-
$ip_address = $astDB->escape($_REQUEST['hostname']);
3331
$jsonDataPost = (array) json_decode(file_get_contents('php://input'), TRUE);
3432

3533
if(!empty($jsonDataRequest)){
@@ -171,9 +169,9 @@
171169
// print_r($resultOfInserts);die;
172170
if(in_array("error", $resultOfInserts)){
173171
$apiresults = array("result" => "error", "message" => "Uploading Leads interrupted due too some errors. Please contact administrator.", "LeadNotSaved" => $leadsNotSaved);
174-
$log_id = log_action($goDB, 'UPLOAD', $log_user, $ip_address, "Error in uploading leads on List ID $list_id", $log_group);
172+
$log_id = log_action($goDB, 'UPLOAD', $log_user, $log_ip, "Error in uploading leads on List ID $list_id", $log_group);
175173
}else{
176174
$apiresults = array("result" => "success", "message" => "Uploading Leads success!");
177-
$log_id = log_action($goDB, 'UPLOAD', $log_user, $ip_address, "Successfully uploaded leads on List ID $list_id", $log_group);
175+
$log_id = log_action($goDB, 'UPLOAD', $log_user, $log_ip, "Successfully uploaded leads on List ID $list_id", $log_group);
178176
}
179177
?>

‎goUserGroups/goAddUserGroup.php

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,7 @@
2222
*/
2323

2424
include_once ("goAPI.php");
25-
26-
$log_user = $session_user;
27-
$log_group = go_get_groupid($session_user, $astDB);
28-
$log_ip = $astDB->escape($_REQUEST["log_ip"]);
29-
$goUser = $astDB->escape($_REQUEST['goUser']);
30-
$goPass = (isset($_REQUEST['log_pass']) ? $astDB->escape($_REQUEST['log_pass']) : $astDB->escape($_REQUEST['goPass']));
31-
25+
3226
// POST or GET Variables
3327
$user_group = $astDB->escape($_REQUEST['user_group']);
3428
$group_name = $astDB->escape($_REQUEST['group_name']);

‎goUserGroups/goCheckUserGroups.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,8 @@
2121
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2222
**/
2323

24-
@include_once ("goAPI.php");
25-
26-
$log_user = $session_user;
27-
$log_group = go_get_groupid($session_user, $astDB);
28-
24+
include_once ("goAPI.php");
25+
2926
// POST or GET Variables
3027
$user_group = $astDB->escape($_REQUEST['user_group']);
3128

‎goUserGroups/goDeleteUserGroup.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@
2323

2424
include_once ("goAPI.php");
2525

26-
$log_user = $session_user;
27-
$log_group = go_get_groupid($session_user, $astDB);
28-
$log_ip = $astDB->escape($_REQUEST["log_ip"]);
29-
$goUser = $astDB->escape($_REQUEST["goUser"]);
30-
$goPass = (isset($_REQUEST["log_pass"]) ? $astDB->escape($_REQUEST["log_pass"]) : $astDB->escape($_REQUEST["goPass"]));
31-
3226
// POST or GET Variables
3327
$user_group = $astDB->escape($_REQUEST['user_group']);
3428

‎goUserGroups/goEditUserGroup.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,6 @@
2222

2323
include_once ("goAPI.php");
2424

25-
$log_user = $session_user;
26-
$log_group = go_get_groupid($session_user, $astDB);
27-
$log_ip = $astDB->escape($_REQUEST["log_ip"]);
28-
$goUser = $astDB->escape($_REQUEST['goUser']);
29-
$goPass = (isset($_REQUEST['log_pass']) ? $astDB->escape($_REQUEST['log_pass']) : $astDB->escape($_REQUEST['goPass']));
30-
31-
3225
// POST or GET Variables
3326
$user_group = $astDB->escape($_REQUEST['user_group']);
3427
$group_name = $astDB->escape($_REQUEST['group_name']);

‎goUserGroups/goGetAllUserGroups.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@
2323
*/
2424
include_once ("goAPI.php");
2525

26-
$log_user = $session_user;
27-
$log_group = go_get_groupid($session_user, $astDB);
28-
$log_ip = $astDB->escape($_REQUEST["log_ip"]);
29-
$goUser = $astDB->escape($_REQUEST['goUser']);
30-
$goPass = (isset($_REQUEST['log_pass']) ? $astDB->escape($_REQUEST['log_pass']) : $astDB->escape($_REQUEST['goPass']));
31-
3226
// Error Checking
3327
if (empty($goUser) || is_null($goUser)) {
3428
$apiresults = array(

‎goUserGroups/goGetUserGroupInfo.php

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,7 @@
2222
**/
2323

2424
include_once ("goAPI.php");
25-
26-
$log_user = $session_user;
27-
$log_group = go_get_groupid($session_user, $astDB);
28-
$log_ip = $astDB->escape($_REQUEST["log_ip"]);
29-
$goUser = $astDB->escape($_REQUEST["goUser"]);
30-
$goPass = (isset($_REQUEST["log_pass"]) ? $astDB->escape($_REQUEST["log_pass"]) : $astDB->escape($_REQUEST["goPass"]));
31-
25+
3226
// POST or GET Variables
3327
$user_group = $astDB->escape($_REQUEST["user_group"]);
3428

0 commit comments

Comments
 (0)