changing versions on trunk to 2.6 after branching of 2.4

git-svn-id: svn://192.168.202.10@1811 3d104415-ff17-0410-8863-d5cf3c621b8a

UPGRADE

@@ -1,12 +1,65 @@
 ################ UPGRADE
 
-NOTE: Upgrading from 2.0.5 to 2.2.0 is below the first section
-NOTE: Upgrading from 2.0.4 to 2.0.5 is below the second section
-NOTE: Upgrading from 2.0.3 to 2.0.4 is below the third section
-NOTE: Upgrading from 2.0.2 to 2.0.3 is below the fourth 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
+NOTE: Upgrading from 2.0.4 to 2.0.5 is below the third section
+NOTE: Upgrading from 2.0.3 to 2.0.4 is below the fourth section
+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.4 TO 2.6 ##########
+
+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 1316 or higher
+	If not, run the instructions for 2.2.0 to 2.4 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.6.sql
+
+    B. Going into mysql and executing the upgrade sql file:
+	mysql
+	use asterisk
+	\. /path/from/root/extras/upgrade_2.6.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. Nothing new yet, we just forked 2.4. New features will go here...
+
+
+
+
+
+
+
 ########## UPGRADING FROM 2.2.0 TO 2.4 ##########
 
 OPTIONAL STEPS(But highly recommended) - Backup existing system:

extras/MySQL_AST_CREATE_tables.sql

@@ -2681,7 +2681,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.4b0.5', CURDATE(), 'Y');
+INSERT INTO system_settings (version,install_date,first_login_trigger) values('2.6b0.5', CURDATE(), 'Y');
 
 INSERT INTO vicidial_status_categories (vsc_id,vsc_name) values('UNDEFINED','Default Category');
 
@@ -2809,7 +2809,7 @@ CREATE TABLE vicidial_log_noanswer_archive LIKE vicidial_log_noanswer;
 CREATE TABLE vicidial_did_agent_log_archive LIKE vicidial_did_agent_log; 
 CREATE UNIQUE INDEX vdala on vicidial_did_agent_log_archive (uniqueid,call_date,did_route);
 
-UPDATE system_settings SET db_schema_version='1316',db_schema_update_date=NOW();
+UPDATE system_settings SET db_schema_version='1318',db_schema_update_date=NOW();
 
 GRANT RELOAD ON *.* TO cron@'%';
 GRANT RELOAD ON *.* TO cron@localhost;

extras/upgrade_2.6.sql

@@ -0,0 +1 @@
+UPDATE system_settings SET db_schema_version='1318',version='2.6b0.5',db_schema_update_date=NOW() where db_schema_version < 1318;

version

@@ -1 +1 @@
-2.4b0.5
+2.6b0.5

www/agc/vicidial.php

@@ -377,10 +377,11 @@
 # 120223-2119 - Removed logging of good login passwords if webroot writable is enabled
 # 120308-1617 - Added compatibility for DAHDI phones using asterisk version for server > 1.4.21.2
 # 120403-1204 - Fixed issue with MANUAL dial method hotkeys, added 1 second delay
+# 120420-1621 - Forked 2.4 to branches, changing trunk to 2.6
 #
 
-$version = '2.4-344c';
-$build = '120403-1204';
+$version = '2.6-345c';
+$build = '120420-1621';
 $mel=1;					# Mysql Error Log enabled = 1
 $mysql_log_count=75;
 $one_mysql_log=0;

www/vicidial/admin.php

@@ -3046,12 +3046,13 @@ else
 # 120316-1203 - Fixed DIALBLE counts for completed statuses
 # 120402-2111 - Added lead loading template and two carrier log reports to the admin utils page
 # 120409-1136 - Added Search Leads Logs as slave db option
+# 120420-1620 - Forked 2.4 to branches, changing trunk to 2.6
 #
 
 # 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.4-364a';
-$build = '120409-1136';
+$admin_version = '2.6-365a';
+$build = '120420-1620';
 
 $STARTtime = date("U");
 $SQLdate = date("Y-m-d H:i:s");