From 9176751dfab70f08e8ba56a05c0120c6a2b635dc Mon Sep 17 00:00:00 2001 From: mattf Date: Fri, 13 Jun 2014 02:05:37 +0000 Subject: [PATCH] Updated version numbers and builds for branch 2.9 Changed trunk to 2.10, added upgrade_2.10.sql git-svn-id: svn://192.168.202.10@2128 3d104415-ff17-0410-8863-d5cf3c621b8a --- .../agc_2.9/LANG_www/agc_br/vicidial.php | 5 +- .../agc_2.9/LANG_www/agc_de/vicidial.php | 5 +- .../agc_2.9/LANG_www/agc_dk/vicidial.php | 5 +- .../agc_2.9/LANG_www/agc_el/vicidial.php | 5 +- .../agc_2.9/LANG_www/agc_es/vicidial.php | 5 +- .../agc_2.9/LANG_www/agc_fr/vicidial.php | 5 +- .../agc_2.9/LANG_www/agc_it/vicidial.php | 5 +- .../agc_2.9/LANG_www/agc_jp/vicidial.php | 5 +- .../agc_2.9/LANG_www/agc_nl/vicidial.php | 5 +- .../agc_2.9/LANG_www/agc_pl/vicidial.php | 5 +- .../agc_2.9/LANG_www/agc_pt/vicidial.php | 5 +- .../agc_2.9/LANG_www/agc_ru/vicidial.php | 5 +- .../agc_2.9/LANG_www/agc_se/vicidial.php | 5 +- .../agc_2.9/LANG_www/agc_sk/vicidial.php | 5 +- .../agc_2.9/LANG_www/agc_tw/vicidial.php | 5 +- .../agc_2.9/LANG_www/vicidial_br/admin.php | 5 +- .../agc_2.9/LANG_www/vicidial_de/admin.php | 5 +- .../agc_2.9/LANG_www/vicidial_el/admin.php | 5 +- .../agc_2.9/LANG_www/vicidial_es/admin.php | 5 +- .../agc_2.9/LANG_www/vicidial_fr/admin.php | 5 +- .../agc_2.9/LANG_www/vicidial_it/admin.php | 5 +- agc_2-X/branches/agc_2.9/UPGRADE | 2 +- agc_2-X/branches/agc_2.9/bin/AST_VDhopper.pl | 5 +- .../extras/MySQL_AST_CREATE_tables.sql | 4 +- .../branches/agc_2.9/extras/upgrade_2.8.sql | 2 + agc_2-X/branches/agc_2.9/version | 2 +- agc_2-X/branches/agc_2.9/www/agc/vicidial.php | 5 +- .../branches/agc_2.9/www/vicidial/admin.php | 5 +- agc_2-X/trunk/UPGRADE | 57 ++++++++++++++++++- agc_2-X/trunk/bin/AST_VDhopper.pl | 5 +- .../trunk/extras/MySQL_AST_CREATE_tables.sql | 4 +- agc_2-X/trunk/extras/upgrade_2.10.sql | 3 + agc_2-X/trunk/version | 2 +- agc_2-X/trunk/www/agc/vicidial.php | 5 +- agc_2-X/trunk/www/vicidial/admin.php | 5 +- 35 files changed, 149 insertions(+), 62 deletions(-) create mode 100644 agc_2-X/trunk/extras/upgrade_2.10.sql diff --git a/agc_2-X/branches/agc_2.9/LANG_www/agc_br/vicidial.php b/agc_2-X/branches/agc_2.9/LANG_www/agc_br/vicidial.php index 16c1a2f5..8d92dba1 100644 --- a/agc_2-X/branches/agc_2.9/LANG_www/agc_br/vicidial.php +++ b/agc_2-X/branches/agc_2.9/LANG_www/agc_br/vicidial.php @@ -431,10 +431,11 @@ # 140519-1011 - Fixed calls in this session to not count monitoring channels # 140521-2147 - Added manual alt dial options and more agent login error messages # 140609-2246 - Fixed issue with webform2 button after manual alt-dial +# 140612-1626 - branched 2.9 version # -$version = '2.8-400c'; -$build = '140609-2246'; +$version = '2.9-401c'; +$build = '140612-1626'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=80; $one_mysql_log=0; diff --git a/agc_2-X/branches/agc_2.9/LANG_www/agc_de/vicidial.php b/agc_2-X/branches/agc_2.9/LANG_www/agc_de/vicidial.php index 8a9fee5e..63eafe35 100644 --- a/agc_2-X/branches/agc_2.9/LANG_www/agc_de/vicidial.php +++ b/agc_2-X/branches/agc_2.9/LANG_www/agc_de/vicidial.php @@ -431,10 +431,11 @@ # 140519-1011 - Fixed calls in this session to not count monitoring channels # 140521-2147 - Added manual alt dial options and more agent login error messages # 140609-2246 - Fixed issue with webform2 button after manual alt-dial +# 140612-1626 - branched 2.9 version # -$version = '2.8-400c'; -$build = '140609-2246'; +$version = '2.9-401c'; +$build = '140612-1626'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=80; $one_mysql_log=0; diff --git a/agc_2-X/branches/agc_2.9/LANG_www/agc_dk/vicidial.php b/agc_2-X/branches/agc_2.9/LANG_www/agc_dk/vicidial.php index 23aee492..e41d88cd 100644 --- a/agc_2-X/branches/agc_2.9/LANG_www/agc_dk/vicidial.php +++ b/agc_2-X/branches/agc_2.9/LANG_www/agc_dk/vicidial.php @@ -431,10 +431,11 @@ # 140519-1011 - Fixed calls in this session to not count monitoring channels # 140521-2147 - Added manual alt dial options and more agent login error messages # 140609-2246 - Fixed issue with webform2 button after manual alt-dial +# 140612-1626 - branched 2.9 version # -$version = '2.8-400c'; -$build = '140609-2246'; +$version = '2.9-401c'; +$build = '140612-1626'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=80; $one_mysql_log=0; diff --git a/agc_2-X/branches/agc_2.9/LANG_www/agc_el/vicidial.php b/agc_2-X/branches/agc_2.9/LANG_www/agc_el/vicidial.php index 62d9758c..d84ff7b3 100644 --- a/agc_2-X/branches/agc_2.9/LANG_www/agc_el/vicidial.php +++ b/agc_2-X/branches/agc_2.9/LANG_www/agc_el/vicidial.php @@ -431,10 +431,11 @@ # 140519-1011 - Fixed calls in this session to not count monitoring channels # 140521-2147 - Added manual alt dial options and more agent login error messages # 140609-2246 - Fixed issue with webform2 button after manual alt-dial +# 140612-1626 - branched 2.9 version # -$version = '2.8-400c'; -$build = '140609-2246'; +$version = '2.9-401c'; +$build = '140612-1626'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=80; $one_mysql_log=0; diff --git a/agc_2-X/branches/agc_2.9/LANG_www/agc_es/vicidial.php b/agc_2-X/branches/agc_2.9/LANG_www/agc_es/vicidial.php index 2cacd007..bae15887 100644 --- a/agc_2-X/branches/agc_2.9/LANG_www/agc_es/vicidial.php +++ b/agc_2-X/branches/agc_2.9/LANG_www/agc_es/vicidial.php @@ -431,10 +431,11 @@ # 140519-1011 - Fixed calls in this session to not count monitoring channels # 140521-2147 - Added manual alt dial options and more agent login error messages # 140609-2246 - Fixed issue with webform2 button after manual alt-dial +# 140612-1626 - branched 2.9 version # -$version = '2.8-400c'; -$build = '140609-2246'; +$version = '2.9-401c'; +$build = '140612-1626'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=80; $one_mysql_log=0; diff --git a/agc_2-X/branches/agc_2.9/LANG_www/agc_fr/vicidial.php b/agc_2-X/branches/agc_2.9/LANG_www/agc_fr/vicidial.php index b4eb742b..07830adf 100644 --- a/agc_2-X/branches/agc_2.9/LANG_www/agc_fr/vicidial.php +++ b/agc_2-X/branches/agc_2.9/LANG_www/agc_fr/vicidial.php @@ -431,10 +431,11 @@ # 140519-1011 - Fixed calls in this session to not count monitoring channels # 140521-2147 - Added manual alt dial options and more agent login error messages # 140609-2246 - Fixed issue with webform2 button after manual alt-dial +# 140612-1626 - branched 2.9 version # -$version = '2.8-400c'; -$build = '140609-2246'; +$version = '2.9-401c'; +$build = '140612-1626'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=80; $one_mysql_log=0; diff --git a/agc_2-X/branches/agc_2.9/LANG_www/agc_it/vicidial.php b/agc_2-X/branches/agc_2.9/LANG_www/agc_it/vicidial.php index 0e2e4e02..4f070af4 100644 --- a/agc_2-X/branches/agc_2.9/LANG_www/agc_it/vicidial.php +++ b/agc_2-X/branches/agc_2.9/LANG_www/agc_it/vicidial.php @@ -431,10 +431,11 @@ # 140519-1011 - Fixed calls in this session to not count monitoring channels # 140521-2147 - Added manual alt dial options and more agent login error messages # 140609-2246 - Fixed issue with webform2 button after manual alt-dial +# 140612-1626 - branched 2.9 version # -$version = '2.8-400c'; -$build = '140609-2246'; +$version = '2.9-401c'; +$build = '140612-1626'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=80; $one_mysql_log=0; diff --git a/agc_2-X/branches/agc_2.9/LANG_www/agc_jp/vicidial.php b/agc_2-X/branches/agc_2.9/LANG_www/agc_jp/vicidial.php index 7c5a21a2..6b89f9b2 100644 --- a/agc_2-X/branches/agc_2.9/LANG_www/agc_jp/vicidial.php +++ b/agc_2-X/branches/agc_2.9/LANG_www/agc_jp/vicidial.php @@ -431,10 +431,11 @@ # 140519-1011 - Fixed calls in this session to not count monitoring channels # 140521-2147 - Added manual alt dial options and more agent login error messages # 140609-2246 - Fixed issue with webform2 button after manual alt-dial +# 140612-1626 - branched 2.9 version # -$version = '2.8-400c'; -$build = '140609-2246'; +$version = '2.9-401c'; +$build = '140612-1626'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=80; $one_mysql_log=0; diff --git a/agc_2-X/branches/agc_2.9/LANG_www/agc_nl/vicidial.php b/agc_2-X/branches/agc_2.9/LANG_www/agc_nl/vicidial.php index 26274bf5..a814ce70 100644 --- a/agc_2-X/branches/agc_2.9/LANG_www/agc_nl/vicidial.php +++ b/agc_2-X/branches/agc_2.9/LANG_www/agc_nl/vicidial.php @@ -431,10 +431,11 @@ # 140519-1011 - Fixed calls in this session to not count monitoring channels # 140521-2147 - Added manual alt dial options and more agent login error messages # 140609-2246 - Fixed issue with webform2 button after manual alt-dial +# 140612-1626 - branched 2.9 version # -$version = '2.8-400c'; -$build = '140609-2246'; +$version = '2.9-401c'; +$build = '140612-1626'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=80; $one_mysql_log=0; diff --git a/agc_2-X/branches/agc_2.9/LANG_www/agc_pl/vicidial.php b/agc_2-X/branches/agc_2.9/LANG_www/agc_pl/vicidial.php index bf99c4c3..09074733 100644 --- a/agc_2-X/branches/agc_2.9/LANG_www/agc_pl/vicidial.php +++ b/agc_2-X/branches/agc_2.9/LANG_www/agc_pl/vicidial.php @@ -431,10 +431,11 @@ # 140519-1011 - Fixed calls in this session to not count monitoring channels # 140521-2147 - Added manual alt dial options and more agent login error messages # 140609-2246 - Fixed issue with webform2 button after manual alt-dial +# 140612-1626 - branched 2.9 version # -$version = '2.8-400c'; -$build = '140609-2246'; +$version = '2.9-401c'; +$build = '140612-1626'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=80; $one_mysql_log=0; diff --git a/agc_2-X/branches/agc_2.9/LANG_www/agc_pt/vicidial.php b/agc_2-X/branches/agc_2.9/LANG_www/agc_pt/vicidial.php index c4a94029..600f90c3 100644 --- a/agc_2-X/branches/agc_2.9/LANG_www/agc_pt/vicidial.php +++ b/agc_2-X/branches/agc_2.9/LANG_www/agc_pt/vicidial.php @@ -431,10 +431,11 @@ # 140519-1011 - Fixed calls in this session to not count monitoring channels # 140521-2147 - Added manual alt dial options and more agent login error messages # 140609-2246 - Fixed issue with webform2 button after manual alt-dial +# 140612-1626 - branched 2.9 version # -$version = '2.8-400c'; -$build = '140609-2246'; +$version = '2.9-401c'; +$build = '140612-1626'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=80; $one_mysql_log=0; diff --git a/agc_2-X/branches/agc_2.9/LANG_www/agc_ru/vicidial.php b/agc_2-X/branches/agc_2.9/LANG_www/agc_ru/vicidial.php index 3e1a11bf..890ce116 100644 --- a/agc_2-X/branches/agc_2.9/LANG_www/agc_ru/vicidial.php +++ b/agc_2-X/branches/agc_2.9/LANG_www/agc_ru/vicidial.php @@ -431,10 +431,11 @@ # 140519-1011 - Fixed calls in this session to not count monitoring channels # 140521-2147 - Added manual alt dial options and more agent login error messages # 140609-2246 - Fixed issue with webform2 button after manual alt-dial +# 140612-1626 - branched 2.9 version # -$version = '2.8-400c'; -$build = '140609-2246'; +$version = '2.9-401c'; +$build = '140612-1626'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=80; $one_mysql_log=0; diff --git a/agc_2-X/branches/agc_2.9/LANG_www/agc_se/vicidial.php b/agc_2-X/branches/agc_2.9/LANG_www/agc_se/vicidial.php index e3fdae24..a40d15ca 100644 --- a/agc_2-X/branches/agc_2.9/LANG_www/agc_se/vicidial.php +++ b/agc_2-X/branches/agc_2.9/LANG_www/agc_se/vicidial.php @@ -431,10 +431,11 @@ # 140519-1011 - Fixed calls in this session to not count monitoring channels # 140521-2147 - Added manual alt dial options and more agent login error messages # 140609-2246 - Fixed issue with webform2 button after manual alt-dial +# 140612-1626 - branched 2.9 version # -$version = '2.8-400c'; -$build = '140609-2246'; +$version = '2.9-401c'; +$build = '140612-1626'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=80; $one_mysql_log=0; diff --git a/agc_2-X/branches/agc_2.9/LANG_www/agc_sk/vicidial.php b/agc_2-X/branches/agc_2.9/LANG_www/agc_sk/vicidial.php index e8a9f608..aae53b79 100644 --- a/agc_2-X/branches/agc_2.9/LANG_www/agc_sk/vicidial.php +++ b/agc_2-X/branches/agc_2.9/LANG_www/agc_sk/vicidial.php @@ -431,10 +431,11 @@ # 140519-1011 - Fixed calls in this session to not count monitoring channels # 140521-2147 - Added manual alt dial options and more agent login error messages # 140609-2246 - Fixed issue with webform2 button after manual alt-dial +# 140612-1626 - branched 2.9 version # -$version = '2.8-400c'; -$build = '140609-2246'; +$version = '2.9-401c'; +$build = '140612-1626'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=80; $one_mysql_log=0; diff --git a/agc_2-X/branches/agc_2.9/LANG_www/agc_tw/vicidial.php b/agc_2-X/branches/agc_2.9/LANG_www/agc_tw/vicidial.php index ae9a5b23..301b672b 100644 --- a/agc_2-X/branches/agc_2.9/LANG_www/agc_tw/vicidial.php +++ b/agc_2-X/branches/agc_2.9/LANG_www/agc_tw/vicidial.php @@ -431,10 +431,11 @@ # 140519-1011 - Fixed calls in this session to not count monitoring channels # 140521-2147 - Added manual alt dial options and more agent login error messages # 140609-2246 - Fixed issue with webform2 button after manual alt-dial +# 140612-1626 - branched 2.9 version # -$version = '2.8-400c'; -$build = '140609-2246'; +$version = '2.9-401c'; +$build = '140612-1626'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=80; $one_mysql_log=0; diff --git a/agc_2-X/branches/agc_2.9/LANG_www/vicidial_br/admin.php b/agc_2-X/branches/agc_2.9/LANG_www/vicidial_br/admin.php index d285bd2b..c283d939 100644 --- a/agc_2-X/branches/agc_2.9/LANG_www/vicidial_br/admin.php +++ b/agc_2-X/branches/agc_2.9/LANG_www/vicidial_br/admin.php @@ -3319,12 +3319,13 @@ else # 140509-2201 - Added frozen_server_call_clear system setting, used in admin.php and AST_timecheck.pl # 140515-1610 - Added clear list option, Issue #763 # 140521-2101 - Added timer_alt_seconds and more Manual Auto Dial options +# 140612-1628 - branched 2.9 version # # make sure you have added a user to the vicidial_users MySQL table with at least user_level 8 to access this page the first time -$admin_version = '2.8-440a'; -$build = '140521-2101'; +$admin_version = '2.9-441a'; +$build = '140612-1628'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); diff --git a/agc_2-X/branches/agc_2.9/LANG_www/vicidial_de/admin.php b/agc_2-X/branches/agc_2.9/LANG_www/vicidial_de/admin.php index 02bc4e1c..23e72645 100644 --- a/agc_2-X/branches/agc_2.9/LANG_www/vicidial_de/admin.php +++ b/agc_2-X/branches/agc_2.9/LANG_www/vicidial_de/admin.php @@ -3319,12 +3319,13 @@ else # 140509-2201 - Added frozen_server_call_clear system setting, used in admin.php and AST_timecheck.pl # 140515-1610 - Added clear list option, Issue #763 # 140521-2101 - Added timer_alt_seconds and more Manual Auto Dial options +# 140612-1628 - branched 2.9 version # # make sure you have added a user to the vicidial_users MySQL table with at least user_level 8 to access this page the first time -$admin_version = '2.8-440a'; -$build = '140521-2101'; +$admin_version = '2.9-441a'; +$build = '140612-1628'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); diff --git a/agc_2-X/branches/agc_2.9/LANG_www/vicidial_el/admin.php b/agc_2-X/branches/agc_2.9/LANG_www/vicidial_el/admin.php index 5358d0d3..b4888199 100644 --- a/agc_2-X/branches/agc_2.9/LANG_www/vicidial_el/admin.php +++ b/agc_2-X/branches/agc_2.9/LANG_www/vicidial_el/admin.php @@ -3319,12 +3319,13 @@ else # 140509-2201 - Added frozen_server_call_clear system setting, used in admin.php and AST_timecheck.pl # 140515-1610 - Added clear list option, Issue #763 # 140521-2101 - Added timer_alt_seconds and more Manual Auto Dial options +# 140612-1628 - branched 2.9 version # # make sure you have added a user to the vicidial_users MySQL table with at least user_level 8 to access this page the first time -$admin_version = '2.8-440a'; -$build = '140521-2101'; +$admin_version = '2.9-441a'; +$build = '140612-1628'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); diff --git a/agc_2-X/branches/agc_2.9/LANG_www/vicidial_es/admin.php b/agc_2-X/branches/agc_2.9/LANG_www/vicidial_es/admin.php index 4209957a..9a56e9ec 100644 --- a/agc_2-X/branches/agc_2.9/LANG_www/vicidial_es/admin.php +++ b/agc_2-X/branches/agc_2.9/LANG_www/vicidial_es/admin.php @@ -3319,12 +3319,13 @@ else # 140509-2201 - Added frozen_server_call_clear system setting, used in admin.php and AST_timecheck.pl # 140515-1610 - Added clear list option, Issue #763 # 140521-2101 - Added timer_alt_seconds and more Manual Auto Dial options +# 140612-1628 - branched 2.9 version # # make sure you have added a user to the vicidial_users MySQL table with at least user_level 8 to access this page the first time -$admin_version = '2.8-440a'; -$build = '140521-2101'; +$admin_version = '2.9-441a'; +$build = '140612-1628'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); diff --git a/agc_2-X/branches/agc_2.9/LANG_www/vicidial_fr/admin.php b/agc_2-X/branches/agc_2.9/LANG_www/vicidial_fr/admin.php index a2c829db..d3ab8733 100644 --- a/agc_2-X/branches/agc_2.9/LANG_www/vicidial_fr/admin.php +++ b/agc_2-X/branches/agc_2.9/LANG_www/vicidial_fr/admin.php @@ -3319,12 +3319,13 @@ else # 140509-2201 - Added frozen_server_call_clear system setting, used in admin.php and AST_timecheck.pl # 140515-1610 - Added clear list option, Issue #763 # 140521-2101 - Added timer_alt_seconds and more Manual Auto Dial options +# 140612-1628 - branched 2.9 version # # make sure you have added a user to the vicidial_users MySQL table with at least user_level 8 to access this page the first time -$admin_version = '2.8-440a'; -$build = '140521-2101'; +$admin_version = '2.9-441a'; +$build = '140612-1628'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); diff --git a/agc_2-X/branches/agc_2.9/LANG_www/vicidial_it/admin.php b/agc_2-X/branches/agc_2.9/LANG_www/vicidial_it/admin.php index 4ad648d1..51a4455e 100644 --- a/agc_2-X/branches/agc_2.9/LANG_www/vicidial_it/admin.php +++ b/agc_2-X/branches/agc_2.9/LANG_www/vicidial_it/admin.php @@ -3319,12 +3319,13 @@ else # 140509-2201 - Added frozen_server_call_clear system setting, used in admin.php and AST_timecheck.pl # 140515-1610 - Added clear list option, Issue #763 # 140521-2101 - Added timer_alt_seconds and more Manual Auto Dial options +# 140612-1628 - branched 2.9 version # # make sure you have added a user to the vicidial_users MySQL table with at least user_level 8 to access this page the first time -$admin_version = '2.8-440a'; -$build = '140521-2101'; +$admin_version = '2.9-441a'; +$build = '140612-1628'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); diff --git a/agc_2-X/branches/agc_2.9/UPGRADE b/agc_2-X/branches/agc_2.9/UPGRADE index 442b4f5c..e2481e82 100644 --- a/agc_2-X/branches/agc_2.9/UPGRADE +++ b/agc_2-X/branches/agc_2.9/UPGRADE @@ -9,7 +9,7 @@ NOTE: Upgrading from 2.0.2 to 2.0.3 is below the fifth section NOTE: Upgrading from 2.0.1 to 2.0.2 is in the next section NOTE: Upgrading from 1.1.12-3 to 2.0.1 is at the bottom -########## UPGRADING FROM 2.7 TO 2.8 ########## +########## UPGRADING FROM 2.7 TO 2.9 release ########## OPTIONAL STEPS(But highly recommended) - Backup existing system: diff --git a/agc_2-X/branches/agc_2.9/bin/AST_VDhopper.pl b/agc_2-X/branches/agc_2.9/bin/AST_VDhopper.pl index 335d595b..b9548e31 100644 --- a/agc_2-X/branches/agc_2.9/bin/AST_VDhopper.pl +++ b/agc_2-X/branches/agc_2.9/bin/AST_VDhopper.pl @@ -77,10 +77,11 @@ # 131008-1518 - Changed campaign flag to allow multiple campaigns # Changed and added several CLI flags, including -t to --test, added --version, --count-only # Added code to restrict all functions if campaign flag is used +# 140612-2124 - Fixed date issue with wrong variable #772 # # constants -$build = '131008-1518'; +$build = '140612-2124'; $DB=0; # Debug flag, set to 0 for no debug messages. Can be overriden with CLI --debug flag $US='__'; $MT[0]=''; @@ -147,7 +148,7 @@ $VDL_one = "$Vyear-$Vmon-$Vmday $Vhour:$Vmin:$Vsec"; ### get date-time of 10 seconds ago ### $VDL_tensec = ($secX - 10); -($Vsec,$Vmin,$Vhour,$Vmday,$Vmon,$Vyear,$Vwday,$Vyday,$Visdst) = localtime($VDL_one); +($Vsec,$Vmin,$Vhour,$Vmday,$Vmon,$Vyear,$Vwday,$Vyday,$Visdst) = localtime($VDL_tensec); $Vyear = ($Vyear + 1900); $Vmon++; if ($Vmon < 10) {$Vmon = "0$Vmon";} diff --git a/agc_2-X/branches/agc_2.9/extras/MySQL_AST_CREATE_tables.sql b/agc_2-X/branches/agc_2.9/extras/MySQL_AST_CREATE_tables.sql index 2986c557..da2b5d52 100644 --- a/agc_2-X/branches/agc_2.9/extras/MySQL_AST_CREATE_tables.sql +++ b/agc_2-X/branches/agc_2.9/extras/MySQL_AST_CREATE_tables.sql @@ -3059,7 +3059,7 @@ INSERT INTO vicidial_inbound_groups(group_id,group_name,group_color,active,queue INSERT INTO vicidial_lists SET list_id='999',list_name='Default inbound list',campaign_id='TESTCAMP',active='N'; INSERT INTO vicidial_lists SET list_id='998',list_name='Default Manual list',campaign_id='TESTCAMP',active='N'; -INSERT INTO system_settings (version,install_date,first_login_trigger) values('2.8b0.5', CURDATE(), 'Y'); +INSERT INTO system_settings (version,install_date,first_login_trigger) values('2.9rc1', CURDATE(), 'Y'); INSERT INTO vicidial_status_categories (vsc_id,vsc_name) values('UNDEFINED','Default Category'); @@ -3268,4 +3268,4 @@ UPDATE vicidial_configuration set value='1766' where name='qc_database_version'; UPDATE system_settings set vdc_agent_api_active='1'; -UPDATE system_settings SET db_schema_version='1378',db_schema_update_date=NOW(),reload_timestamp=NOW(); +UPDATE system_settings SET db_schema_version='1379',db_schema_update_date=NOW(),reload_timestamp=NOW(); diff --git a/agc_2-X/branches/agc_2.9/extras/upgrade_2.8.sql b/agc_2-X/branches/agc_2.9/extras/upgrade_2.8.sql index 6d69ab2c..18008634 100644 --- a/agc_2-X/branches/agc_2.9/extras/upgrade_2.8.sql +++ b/agc_2-X/branches/agc_2.9/extras/upgrade_2.8.sql @@ -261,3 +261,5 @@ ALTER TABLE vicidial_campaigns MODIFY alt_number_dialing ENUM('N','Y','SELECTED' ALTER TABLE vicidial_campaigns ADD timer_alt_seconds SMALLINT(5) default '0'; UPDATE system_settings SET db_schema_version='1378',db_schema_update_date=NOW() where db_schema_version < 1378; + +UPDATE system_settings SET db_schema_version='1379',version='2.9rc1',db_schema_update_date=NOW() where db_schema_version < 1379; diff --git a/agc_2-X/branches/agc_2.9/version b/agc_2-X/branches/agc_2.9/version index 65966096..4ca03019 100644 --- a/agc_2-X/branches/agc_2.9/version +++ b/agc_2-X/branches/agc_2.9/version @@ -1 +1 @@ -2.8b0.5 +2.9rc1 diff --git a/agc_2-X/branches/agc_2.9/www/agc/vicidial.php b/agc_2-X/branches/agc_2.9/www/agc/vicidial.php index d68d1e2e..9063a50d 100644 --- a/agc_2-X/branches/agc_2.9/www/agc/vicidial.php +++ b/agc_2-X/branches/agc_2.9/www/agc/vicidial.php @@ -431,10 +431,11 @@ # 140519-1011 - Fixed calls in this session to not count monitoring channels # 140521-2147 - Added manual alt dial options and more agent login error messages # 140609-2246 - Fixed issue with webform2 button after manual alt-dial +# 140612-1626 - branched 2.9 version # -$version = '2.8-400c'; -$build = '140609-2246'; +$version = '2.9-401c'; +$build = '140612-1626'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=80; $one_mysql_log=0; diff --git a/agc_2-X/branches/agc_2.9/www/vicidial/admin.php b/agc_2-X/branches/agc_2.9/www/vicidial/admin.php index 820d5a8a..99115c1f 100644 --- a/agc_2-X/branches/agc_2.9/www/vicidial/admin.php +++ b/agc_2-X/branches/agc_2.9/www/vicidial/admin.php @@ -3319,12 +3319,13 @@ else # 140509-2201 - Added frozen_server_call_clear system setting, used in admin.php and AST_timecheck.pl # 140515-1610 - Added clear list option, Issue #763 # 140521-2101 - Added timer_alt_seconds and more Manual Auto Dial options +# 140612-1628 - branched 2.9 version # # make sure you have added a user to the vicidial_users MySQL table with at least user_level 8 to access this page the first time -$admin_version = '2.8-440a'; -$build = '140521-2101'; +$admin_version = '2.9-441a'; +$build = '140612-1628'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); diff --git a/agc_2-X/trunk/UPGRADE b/agc_2-X/trunk/UPGRADE index 442b4f5c..22d6bb7b 100644 --- a/agc_2-X/trunk/UPGRADE +++ b/agc_2-X/trunk/UPGRADE @@ -1,5 +1,6 @@ ################ UPGRADE +NOTE: Upgrading from 2.7 to 2.9 is below the first section NOTE: Upgrading from 2.4 to 2.7 is below the first section NOTE: Upgrading from 2.2.1 to 2.4 is below the first section NOTE: Upgrading from 2.0.5 to 2.2.0 is below the second section @@ -9,7 +10,61 @@ NOTE: Upgrading from 2.0.2 to 2.0.3 is below the fifth section NOTE: Upgrading from 2.0.1 to 2.0.2 is in the next section NOTE: Upgrading from 1.1.12-3 to 2.0.1 is at the bottom -########## UPGRADING FROM 2.7 TO 2.8 ########## +########## UPGRADING FROM 2.9 TO 2.10 ########## + +OPTIONAL STEPS(But highly recommended) - Backup existing system: + +1. Run this for a 1-server system or server with database on it: + (this may take hours on large system) + /usr/share/astguiclient/ADMIN_backup.pl --debugX + +2. Run this on dialer/Asterisk-only servers: + (do not run this if you only have one server): + /usr/share/astguiclient/ADMIN_backup.pl --debugX --without-db --without-web + + +REQUIRED STEPS!!! + +1. Check system_settings, make sure you are at DB Schema Version 1378 or higher + If not, run the instructions for 2.7 to 2.9 before this section. + +2. upgrade the MySQL asterisk database(you have two options): + A. Running the upgrade file directly from Linux: + mysql -f --database=asterisk < /path/from/root/extras/upgrade_2.10.sql + + B. Going into mysql and executing the upgrade sql file: + mysql + use asterisk + \. /path/from/root/extras/upgrade_2.8.sql + quit + +3. install new files: + perl ./install.pl + NOTES: If you have customized any scripts in the bin or agi folders, + then make sure you back them up before running the install.pl script. + This script will replace existing files in the astguiclient installation. + +4. For each of your ViciDial servers, go the Admin -> Servers -> Modify Server + page and set each one to "Rebuild conf files = Y" and click submit. + This will rebuild the conf files to ensure any changes are updated. + +5. On one server only, update your phone codes data: + /usr/share/astguiclient/ADMIN_area_code_populate.pl --purge-table --debug + + +OTHER CHANGES: + +1. Just branched 2.9, no changes yet + + + + + + + + + +########## UPGRADING FROM 2.7 TO 2.8 (2.9 release branch) ########## OPTIONAL STEPS(But highly recommended) - Backup existing system: diff --git a/agc_2-X/trunk/bin/AST_VDhopper.pl b/agc_2-X/trunk/bin/AST_VDhopper.pl index 335d595b..b9548e31 100644 --- a/agc_2-X/trunk/bin/AST_VDhopper.pl +++ b/agc_2-X/trunk/bin/AST_VDhopper.pl @@ -77,10 +77,11 @@ # 131008-1518 - Changed campaign flag to allow multiple campaigns # Changed and added several CLI flags, including -t to --test, added --version, --count-only # Added code to restrict all functions if campaign flag is used +# 140612-2124 - Fixed date issue with wrong variable #772 # # constants -$build = '131008-1518'; +$build = '140612-2124'; $DB=0; # Debug flag, set to 0 for no debug messages. Can be overriden with CLI --debug flag $US='__'; $MT[0]=''; @@ -147,7 +148,7 @@ $VDL_one = "$Vyear-$Vmon-$Vmday $Vhour:$Vmin:$Vsec"; ### get date-time of 10 seconds ago ### $VDL_tensec = ($secX - 10); -($Vsec,$Vmin,$Vhour,$Vmday,$Vmon,$Vyear,$Vwday,$Vyday,$Visdst) = localtime($VDL_one); +($Vsec,$Vmin,$Vhour,$Vmday,$Vmon,$Vyear,$Vwday,$Vyday,$Visdst) = localtime($VDL_tensec); $Vyear = ($Vyear + 1900); $Vmon++; if ($Vmon < 10) {$Vmon = "0$Vmon";} diff --git a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql index 2986c557..4f483b55 100644 --- a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql +++ b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql @@ -3059,7 +3059,7 @@ INSERT INTO vicidial_inbound_groups(group_id,group_name,group_color,active,queue INSERT INTO vicidial_lists SET list_id='999',list_name='Default inbound list',campaign_id='TESTCAMP',active='N'; INSERT INTO vicidial_lists SET list_id='998',list_name='Default Manual list',campaign_id='TESTCAMP',active='N'; -INSERT INTO system_settings (version,install_date,first_login_trigger) values('2.8b0.5', CURDATE(), 'Y'); +INSERT INTO system_settings (version,install_date,first_login_trigger) values('2.10b0.5', CURDATE(), 'Y'); INSERT INTO vicidial_status_categories (vsc_id,vsc_name) values('UNDEFINED','Default Category'); @@ -3268,4 +3268,4 @@ UPDATE vicidial_configuration set value='1766' where name='qc_database_version'; UPDATE system_settings set vdc_agent_api_active='1'; -UPDATE system_settings SET db_schema_version='1378',db_schema_update_date=NOW(),reload_timestamp=NOW(); +UPDATE system_settings SET db_schema_version='1380',db_schema_update_date=NOW(),reload_timestamp=NOW(); diff --git a/agc_2-X/trunk/extras/upgrade_2.10.sql b/agc_2-X/trunk/extras/upgrade_2.10.sql new file mode 100644 index 00000000..c8c073ef --- /dev/null +++ b/agc_2-X/trunk/extras/upgrade_2.10.sql @@ -0,0 +1,3 @@ +UPDATE system_settings SET db_schema_version='1379',version='2.9rc1tk',db_schema_update_date=NOW() where db_schema_version < 1379; + +UPDATE system_settings SET db_schema_version='1380',version='2.10b0.5',db_schema_update_date=NOW() where db_schema_version < 1380; diff --git a/agc_2-X/trunk/version b/agc_2-X/trunk/version index 65966096..f6d472ee 100644 --- a/agc_2-X/trunk/version +++ b/agc_2-X/trunk/version @@ -1 +1 @@ -2.8b0.5 +2.10b0.5 diff --git a/agc_2-X/trunk/www/agc/vicidial.php b/agc_2-X/trunk/www/agc/vicidial.php index d68d1e2e..0a6d9f88 100644 --- a/agc_2-X/trunk/www/agc/vicidial.php +++ b/agc_2-X/trunk/www/agc/vicidial.php @@ -431,10 +431,11 @@ # 140519-1011 - Fixed calls in this session to not count monitoring channels # 140521-2147 - Added manual alt dial options and more agent login error messages # 140609-2246 - Fixed issue with webform2 button after manual alt-dial +# 140612-2152 - branched 2.9 version, raised trunk to 2.10 # -$version = '2.8-400c'; -$build = '140609-2246'; +$version = '2.10-402c'; +$build = '140612-2152'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=80; $one_mysql_log=0; diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php index 820d5a8a..eefd4b24 100644 --- a/agc_2-X/trunk/www/vicidial/admin.php +++ b/agc_2-X/trunk/www/vicidial/admin.php @@ -3319,12 +3319,13 @@ else # 140509-2201 - Added frozen_server_call_clear system setting, used in admin.php and AST_timecheck.pl # 140515-1610 - Added clear list option, Issue #763 # 140521-2101 - Added timer_alt_seconds and more Manual Auto Dial options +# 140612-2153 - branched 2.9 version, raised trunk to 2.10 # # make sure you have added a user to the vicidial_users MySQL table with at least user_level 8 to access this page the first time -$admin_version = '2.8-440a'; -$build = '140521-2101'; +$admin_version = '2.10-442a'; +$build = '140612-2153'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s");