diff --git a/agc_2-X/trunk/docs/BASE_INSTALL.txt b/agc_2-X/trunk/docs/BASE_INSTALL.txt index 2b91110e..5d0090b6 100644 --- a/agc_2-X/trunk/docs/BASE_INSTALL.txt +++ b/agc_2-X/trunk/docs/BASE_INSTALL.txt @@ -85,6 +85,10 @@ cd ../asterisk-1.2.18 patch -p1 < ./cli_chan_concise_delimiter.patch - File to patch: cli.c + *OPTIONAL*(1.2.14 thru 1.2.18) rewrite of waitforsilence + wget http://www.eflo.net/files/app_waitforsilence.c + mv app_waitforsilence.c apps/app_waitforsilence.c + make clean make make install diff --git a/agc_2-X/trunk/docs/REQUIRED_APPS_INSTALL.txt b/agc_2-X/trunk/docs/REQUIRED_APPS_INSTALL.txt index 53f3e624..571a37fe 100644 --- a/agc_2-X/trunk/docs/REQUIRED_APPS_INSTALL.txt +++ b/agc_2-X/trunk/docs/REQUIRED_APPS_INSTALL.txt @@ -138,7 +138,7 @@ cd zlib-1.2.3 make make install cd /usr/local -wget http://mirror.mcs.anl.gov/openssh/portable/openssh-4.6p1.tar.gz +wget http://gulus.usherbrooke.ca/pub/appl/ssh/OpenSSH/portable/openssh-4.6p1.tar.gz gunzip openssh-4.6p1.tar.gz tar xvf openssh-4.6p1.tar cd openssh-4.6p1 @@ -161,9 +161,9 @@ cd /usr/local wget http://apache.secsup.org/dist/httpd/httpd-2.0.59.tar.gz gunzip httpd-2.0.59.tar.gz tar xvf httpd-2.0.59.tar -wget http://us2.php.net/distributions/php-4.4.6.tar.gz -gunzip php-4.4.6.tar.gz -tar xvf php-4.4.6.tar +wget http://us2.php.net/distributions/php-4.4.7.tar.gz +gunzip php-4.4.7.tar.gz +tar xvf php-4.4.7.tar cd httpd-2.0.59 ./configure --prefix=/usr/local/apache2 --enable-ssl --enable-setenvif --enable-so --with-apxs2 --enable-dav --enable-maintainer-mode make @@ -177,7 +177,7 @@ openssl req -new -x509 -days 1200 -keyout /usr/local/apache2/conf/ssl.key/server openssl rsa -in /usr/local/apache2/conf/ssl.key/server.key.cpy -out /usr/local/apache2/conf/ssl.key/server.key -cd ../php-4.4.6 +cd ../php-4.4.7 ./configure --with-mysql=/usr/local/mysql --enable-inline-optimization --enable-memory-limit --enable-track-vars --enable-libgcc --with-xml --enable-versioning --enable-sysvsem --with-openssl --disable-debug --with-apxs2=/usr/local/apache2/bin/apxs --with-zlib make make install diff --git a/agc_2-X/trunk/docs/SCRATCH_INSTALL.txt b/agc_2-X/trunk/docs/SCRATCH_INSTALL.txt index 85aeabac..d47d2994 100644 --- a/agc_2-X/trunk/docs/SCRATCH_INSTALL.txt +++ b/agc_2-X/trunk/docs/SCRATCH_INSTALL.txt @@ -623,7 +623,7 @@ updated on your system, so we're going to install a new version now. - make - make install - cd /usr/local - - wget http://mirror.mcs.anl.gov/openssh/portable/openssh-4.6p1.tar.gz + - wget http://gulus.usherbrooke.ca/pub/appl/ssh/OpenSSH/portable/openssh-4.6p1.tar.gz - gunzip openssh-4.6p1.tar.gz - tar xvf openssh-4.6p1.tar - cd openssh-4.6p1 @@ -664,15 +664,15 @@ installation on another machine) - wget http://apache.secsup.org/dist/httpd/httpd-2.0.59.tar.gz - gunzip httpd-2.0.59.tar.gz - tar xvf httpd-2.0.59.tar - - wget http://us2.php.net/distributions/php-4.4.6.tar.gz + - wget http://us2.php.net/distributions/php-4.4.7.tar.gz NOTE: PHP 5.1.1 has also been tested with this release - - gunzip php-4.4.6.tar.gz - - tar xvf php-4.4.6.tar + - gunzip php-4.4.7.tar.gz + - tar xvf php-4.4.7.tar - cd httpd-2.0.59 - ./configure --enable-so --with-apxs2 - make - make install - - cd ../php-4.4.6 + - cd ../php-4.4.7 - ./configure --with-apxs2=/usr/local/apache2/bin/apxs --with-mysql - make - make install diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php index d34cd620..4edaa8ac 100644 --- a/agc_2-X/trunk/www/vicidial/admin.php +++ b/agc_2-X/trunk/www/vicidial/admin.php @@ -1039,15 +1039,17 @@ $list_mix_container = ereg_replace(";","",$list_mix_container); # 70530-1354 - Added human_answered field to statuses, added system status modification # 70530-1714 - Added lists for all campaign subsections # 70531-1631 - Development on List mix admin interface +# 70601-1629 - More development on List mix admin interface, formatting, and added some javascript # # 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.0.4-100'; -$build = '70531-1631'; +$admin_version = '2.0.4-101'; +$build = '70601-1629'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); $MT[0]=''; +$US='_'; if ($force_logout) { @@ -3269,9 +3271,42 @@ if ($hh=='reports') {$reports_hh="bgcolor=\"$reports_color\""; $reports_fc="$reports_font"; $reports_bold="$header_selected_bold";} else {$reports_hh=''; $reports_fc='WHITE'; $reports_bold="$header_nonselected_bold";} +echo "\n"; +echo "