more PHP7 fixes
git-svn-id: svn://192.168.202.10@3144 3d104415-ff17-0410-8863-d5cf3c621b8a
This commit is contained in:
@@ -23,7 +23,7 @@ function f_tcalParseDate (s_date) {
|
|||||||
|
|
||||||
if (n_year < 100)
|
if (n_year < 100)
|
||||||
n_year += (n_year < this.a_tpl.centyear ? 2000 : 1900);
|
n_year += (n_year < this.a_tpl.centyear ? 2000 : 1900);
|
||||||
if (n_month < 1 || n_month > 12)
|
if (n_month < 0 || n_month > 12)
|
||||||
return alert ("Invalid month value: '" + n_month + "'.\nAllowed range is 01-12.");
|
return alert ("Invalid month value: '" + n_month + "'.\nAllowed range is 01-12.");
|
||||||
var d_numdays = new Date(n_year, n_month, 0);
|
var d_numdays = new Date(n_year, n_month, 0);
|
||||||
if (n_day > d_numdays.getDate())
|
if (n_day > d_numdays.getDate())
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
# functions for agent scripts
|
# functions for agent scripts
|
||||||
#
|
#
|
||||||
# Copyright (C) 2018 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
|
# Copyright (C) 2019 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
# CHANGES:
|
# CHANGES:
|
||||||
@@ -47,6 +47,7 @@
|
|||||||
# 180327-1357 - Added code for LOCALFQDN conversion to browser-used server URL script iframes
|
# 180327-1357 - Added code for LOCALFQDN conversion to browser-used server URL script iframes
|
||||||
# 180503-1817 - Added code for SWITCH field type
|
# 180503-1817 - Added code for SWITCH field type
|
||||||
# 181004-1644 - Fix for defaut field in AREA type
|
# 181004-1644 - Fix for defaut field in AREA type
|
||||||
|
# 191013-1029 - Fixes for PHP7
|
||||||
#
|
#
|
||||||
|
|
||||||
# $mysql_queries = 26
|
# $mysql_queries = 26
|
||||||
@@ -370,6 +371,26 @@ function custom_list_fields_values($lead_id,$list_id,$uniqueid,$user,$DB,$call_i
|
|||||||
$duplicates_list='';
|
$duplicates_list='';
|
||||||
$duplicates_master_list='';
|
$duplicates_master_list='';
|
||||||
$duplicates_count=0;
|
$duplicates_count=0;
|
||||||
|
$A_field_id = array();
|
||||||
|
$A_field_label = array();
|
||||||
|
$A_field_name = array();
|
||||||
|
$A_field_description = array();
|
||||||
|
$A_field_rank = array();
|
||||||
|
$A_field_help = array();
|
||||||
|
$A_field_type = array();
|
||||||
|
$A_field_options = array();
|
||||||
|
$A_field_size = array();
|
||||||
|
$A_field_max = array();
|
||||||
|
$A_field_default = array();
|
||||||
|
$A_field_cost = array();
|
||||||
|
$A_field_required = array();
|
||||||
|
$A_multi_position = array();
|
||||||
|
$A_name_position = array();
|
||||||
|
$A_field_order = array();
|
||||||
|
$A_field_duplicate = array();
|
||||||
|
$A_field_value = array();
|
||||||
|
$A_master_field = array();
|
||||||
|
$A_field_select = array();
|
||||||
$o=0;
|
$o=0;
|
||||||
while ($fields_to_print > $o)
|
while ($fields_to_print > $o)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -363,6 +363,15 @@ if ($stage=='SUBMIT')
|
|||||||
if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'06003',$user,$server_ip,$session_name,$one_mysql_log);}
|
if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'06003',$user,$server_ip,$session_name,$one_mysql_log);}
|
||||||
$fields_to_print = mysqli_num_rows($rslt);
|
$fields_to_print = mysqli_num_rows($rslt);
|
||||||
$fields_list='';
|
$fields_list='';
|
||||||
|
$A_field_id = array();
|
||||||
|
$A_field_label = array();
|
||||||
|
$A_field_name = array();
|
||||||
|
$A_field_type = array();
|
||||||
|
$A_field_size = array();
|
||||||
|
$A_field_max = array();
|
||||||
|
$A_field_required = array();
|
||||||
|
$A_field_duplicate = array();
|
||||||
|
$A_field_value = array();
|
||||||
$o=0;
|
$o=0;
|
||||||
while ($fields_to_print > $o)
|
while ($fields_to_print > $o)
|
||||||
{
|
{
|
||||||
@@ -388,7 +397,8 @@ if ($stage=='SUBMIT')
|
|||||||
if ( ($A_field_type[$o]=='MULTI') or ($A_field_type[$o]=='CHECKBOX') or ($A_field_type[$o]=='RADIO') )
|
if ( ($A_field_type[$o]=='MULTI') or ($A_field_type[$o]=='CHECKBOX') or ($A_field_type[$o]=='RADIO') )
|
||||||
{
|
{
|
||||||
$k=0;
|
$k=0;
|
||||||
$multi_count = count($form_field_value);
|
$multi_count=0;
|
||||||
|
if (is_array($form_field_value)) {$multi_count = count($form_field_value);}
|
||||||
$multi_array = $form_field_value;
|
$multi_array = $form_field_value;
|
||||||
while ($k < $multi_count)
|
while ($k < $multi_count)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<?php
|
<?php
|
||||||
# admin_lists_custom.php
|
# admin_lists_custom.php
|
||||||
#
|
#
|
||||||
# Copyright (C) 2018 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
|
# Copyright (C) 2019 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
|
||||||
#
|
#
|
||||||
# this screen manages the custom lists fields in ViciDial
|
# this screen manages the custom lists fields in ViciDial
|
||||||
#
|
#
|
||||||
@@ -52,10 +52,11 @@
|
|||||||
# 180316-0754 - Translated phrases fixes, issue #1081
|
# 180316-0754 - Translated phrases fixes, issue #1081
|
||||||
# 180502-2215 - Added new help display
|
# 180502-2215 - Added new help display
|
||||||
# 180504-1807 - Added new SWITCH field type
|
# 180504-1807 - Added new SWITCH field type
|
||||||
|
# 191013-1014 - Fixes for PHP7
|
||||||
#
|
#
|
||||||
|
|
||||||
$admin_version = '2.14-43';
|
$admin_version = '2.14-44';
|
||||||
$build = '180504-1807';
|
$build = '191013-1014';
|
||||||
|
|
||||||
require("dbconnect_mysqli.php");
|
require("dbconnect_mysqli.php");
|
||||||
require("functions.php");
|
require("functions.php");
|
||||||
@@ -1068,6 +1069,26 @@ if ( ($action == "MODIFY_CUSTOM_FIELDS") and ($list_id > 99) )
|
|||||||
$rslt=mysql_to_mysqli($stmt, $link);
|
$rslt=mysql_to_mysqli($stmt, $link);
|
||||||
$fields_to_print = mysqli_num_rows($rslt);
|
$fields_to_print = mysqli_num_rows($rslt);
|
||||||
$fields_list='';
|
$fields_list='';
|
||||||
|
|
||||||
|
$A_field_id = array();
|
||||||
|
$A_field_label = array();
|
||||||
|
$A_field_name = array();
|
||||||
|
$A_field_description = array();
|
||||||
|
$A_field_rank = array();
|
||||||
|
$A_field_help = array();
|
||||||
|
$A_field_type = array();
|
||||||
|
$A_field_options = array();
|
||||||
|
$A_field_size = array();
|
||||||
|
$A_field_max = array();
|
||||||
|
$A_field_default = array();
|
||||||
|
$A_field_cost = array();
|
||||||
|
$A_field_required = array();
|
||||||
|
$A_multi_position = array();
|
||||||
|
$A_name_position = array();
|
||||||
|
$A_field_order = array();
|
||||||
|
$A_field_encrypt = array();
|
||||||
|
$A_field_show_hide = array();
|
||||||
|
$A_field_duplicate = array();
|
||||||
$o=0;
|
$o=0;
|
||||||
while ($fields_to_print > $o)
|
while ($fields_to_print > $o)
|
||||||
{
|
{
|
||||||
@@ -1364,6 +1385,7 @@ if ( ($action == "MODIFY_CUSTOM_FIELDS") and ($list_id > 99) )
|
|||||||
}
|
}
|
||||||
if ($A_field_type[$o]=='TIME')
|
if ($A_field_type[$o]=='TIME')
|
||||||
{
|
{
|
||||||
|
if ( ($A_field_default[$o] == 'NULL') or (strlen($A_field_default[$o]) < 1) ) {$A_field_default[$o]=0;}
|
||||||
$minute_diff = $A_field_default[$o];
|
$minute_diff = $A_field_default[$o];
|
||||||
$default_time = date("H:i:s", mktime(date("H"),date("i")+$minute_diff,date("s"),date("m"),date("d"),date("Y")));
|
$default_time = date("H:i:s", mktime(date("H"),date("i")+$minute_diff,date("s"),date("m"),date("d"),date("Y")));
|
||||||
$default_hour = date("H", mktime(date("H"),date("i")+$minute_diff,date("s"),date("m"),date("d"),date("Y")));
|
$default_hour = date("H", mktime(date("H"),date("i")+$minute_diff,date("s"),date("m"),date("d"),date("Y")));
|
||||||
@@ -1663,6 +1685,10 @@ if ($action == "LIST")
|
|||||||
$stmt="SELECT list_id,list_name,active,campaign_id from vicidial_lists $whereLOGallowed_campaignsSQL order by list_id;";
|
$stmt="SELECT list_id,list_name,active,campaign_id from vicidial_lists $whereLOGallowed_campaignsSQL order by list_id;";
|
||||||
$rslt=mysql_to_mysqli($stmt, $link);
|
$rslt=mysql_to_mysqli($stmt, $link);
|
||||||
$lists_to_print = mysqli_num_rows($rslt);
|
$lists_to_print = mysqli_num_rows($rslt);
|
||||||
|
$A_list_id = array();
|
||||||
|
$A_list_name = array();
|
||||||
|
$A_active = array();
|
||||||
|
$A_campaign_id = array();
|
||||||
$o=0;
|
$o=0;
|
||||||
while ($lists_to_print > $o)
|
while ($lists_to_print > $o)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user